Import patches-unapplied version 0.77 to ubuntu/jaunty

Imported using git-ubuntu import.

Changelog parent: f9f0faaacc

New changelog entries:
  * Remove the D-Bus machine identifier from the livefs; it needs to be
    unique, and it's generated at boot time if it's missing (LP: #322830).

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (0.77) jaunty; urgency=low
+
+  * Remove the D-Bus machine identifier from the livefs; it needs to be
+    unique, and it's generated at boot time if it's missing (LP: #322830).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 29 Jan 2009 17:21:23 +0000
+
 livecd-rootfs (0.76) jaunty; urgency=low
 
   * Allow kernel-less builds for armel for now (see

livecd.sh

@@ -479,6 +479,9 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
     rm -f ${ROOT}var/spool/postfix/maildrop/*
     # Removing update-notifier notes is now considered harmful:
     #rm -f ${ROOT}var/lib/update-notifier/user.d/*
+    # The D-Bus machine identifier needs to be unique, and is generated at
+    # boot time if it's missing.
+    rm -f ${ROOT}var/lib/dbus/machine-id
     chroot $ROOT apt-get update || true	# give them fresh lists, but don't fail
     rm -f ${ROOT}etc/resolv.conf ${ROOT}etc/mailname
     if [ -f ${ROOT}/etc/postfix/main.cf ]; then