From a82f62e1077283706026786a709f6a2f226d415a Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 10 Mar 2011 14:48:05 +0100
Subject: [PATCH] make sure preinstalled images do not have the build machine
 set as hostname brefore oem-config runs (LP: #605972)

---
 debian/changelog | 7 +++++++
 livecd.sh        | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43b327c1..cc932629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.163) UNRELEASED; 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:43:43 +0100
+
 livecd-rootfs (1.162) natty; urgency=low
 
   * the name of the flavour needs to be ubuntu-headless, not just headless
diff --git a/livecd.sh b/livecd.sh
index 72d210e4..17801190 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -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}