From a2db2b645b90fb4d74046beb74df34b2a1d58db1 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 19 Dec 2007 01:21:23 +0200 Subject: [PATCH] livecd.sh: Leave a token empty xorg.conf in place to let xserver-xorg postinst know it needs to regenerate it. (LP: #174537) --- debian/changelog | 7 ++++++- livecd.sh | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c09d7de..0ecae7b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ livecd-rootfs (0.45) UNRELEASED; urgency=low + [ Colin Watson ] * Vcs-Bzr is now an official field. Use an unauthenticated URL for it. - -- Colin Watson Tue, 11 Dec 2007 15:53:51 +0000 + [ Bryce Harrington ] + * livecd.sh: Leave a token empty xorg.conf in place to let + xserver-xorg postinst know it needs to regenerate it. (LP: #174537) + + -- Timo Aaltonen Wed, 19 Dec 2007 01:20:53 +0200 livecd-rootfs (0.44) hardy; urgency=low diff --git a/livecd.sh b/livecd.sh index 48604496..59c4960c 100755 --- a/livecd.sh +++ b/livecd.sh @@ -358,6 +358,8 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} # get rid of the .debs - we don't need them. chroot ${ROOT} apt-get clean rm -f ${ROOT}etc/X11/xorg.conf + # Restore an empty xorg.conf, else xserver-xorg postinst will be confused + touch ${ROOT}etc/X11/xorg.conf rm -f ${ROOT}var/lib/apt/lists/*_* rm -f ${ROOT}var/spool/postfix/maildrop/* # Removing update-notifier notes is now considered harmful: