From 0af7b83b7f4ae8d088adcb226c4fce4600a8bdd5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 29 Jan 2009 17:21:10 +0000 Subject: [PATCH] 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 | 7 +++++++ livecd.sh | 3 +++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2123f6a3..c55ef4d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.77) UNRELEASED; 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 Thu, 29 Jan 2009 17:20:00 +0000 + livecd-rootfs (0.76) jaunty; urgency=low * Allow kernel-less builds for armel for now (see diff --git a/livecd.sh b/livecd.sh index 28b2a43e..be4708f0 100755 --- a/livecd.sh +++ b/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