From 180d643a8f77a54414222ed107cb27a3a5b20d9a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Tue, 7 Jul 2009 13:07:03 +0100
Subject: [PATCH] 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 | 5 +++++
 livecd.sh        | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c32f5753..bf118cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 livecd-rootfs (0.87) UNRELEASED; 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.
+
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 30 Jun 2009 23:20:20 +0300
 
 livecd-rootfs (0.86) karmic; urgency=low
diff --git a/livecd.sh b/livecd.sh
index a2b15d4b..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