Import patches-unapplied version 1.163 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 697b3e4854930731204673e9a7e4df138fcdba3d

New changelog entries:
  * make sure preinstalled images do not have the build machine set as
    hostname before oem-config runs (LP: #605972)
This commit is contained in:
Oliver Grawert 2011-03-10 14:48:43 +01:00 committed by usd-importer
parent 697b3e4854
commit 953cf9baaf
2 changed files with 10 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (1.163) natty; urgency=low
* make sure preinstalled images do not have the build machine set as
hostname before oem-config runs (LP: #605972)
-- Oliver Grawert <ogra@ubuntu.com> Thu, 10 Mar 2011 14:48:43 +0100
livecd-rootfs (1.162) natty; urgency=low
* the name of the flavour needs to be ubuntu-headless, not just headless

View File

@ -100,6 +100,9 @@ livefs_ext2()
dd if=/dev/zero of=${MOUNTPOINT}/SWAP.swap bs=1048576 count=512
mkswap ${MOUNTPOINT}/SWAP.swap
# make sure we dont have the buildd name set as hostname (LP: #605972)
echo "localhost" >${MOUNTPOINT}/etc/hostname
# clean up
umount ${MOUNTPOINT}
rm -rf ${MOUNTPOINT}