From 350c154c6eac5f0d30bedcb47986290747cba054 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 7 Jul 2009 13:07:47 +0100
Subject: [PATCH] Import patches-unapplied version 0.87 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: f44fd3cf4e2367ccbe4a3f0f1bbb73d9441617e7

New changelog entries:
  [ Timo Aaltonen ]
  * livecd.sh: Don't mess with xorg.conf anymore, we don't install one
    by default.
  [ Colin Watson ]
  * Clean up the chroot tree before trying to remove it, just in case
    there's some leftover junk from a previous failed build.
---
 debian/changelog | 12 ++++++++++++
 livecd.sh        |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62577cf1..c55b3aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (0.87) karmic; urgency=low
+
+  [ Timo Aaltonen ]
+  * livecd.sh: Don't mess with xorg.conf anymore, we don't install one
+    by default.
+
+  [ Colin Watson ]
+  * Clean up the chroot tree before trying to remove it, just in case
+    there's some leftover junk from a previous failed build.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 07 Jul 2009 13:07:47 +0100
+
 livecd-rootfs (0.86) karmic; urgency=low
 
   [ Scott Kitterman ]
diff --git a/livecd.sh b/livecd.sh
index 7eeb8f43..d5dcbe18 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -160,6 +160,9 @@ for FS in "$@"; do
 
     select_mirror
 
+    # Just in case there's some leftover junk here:
+    cleanup 2>/dev/null || true
+
     rm -rf ${ROOT}
 
     mkdir -p ${ROOT}var/cache/debconf
@@ -472,9 +475,6 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
 
     # 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: