From 1981539d3d569ca988099d996e703c20710b6cf2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 11 Aug 2011 12:19:25 +0100
Subject: [PATCH] BuildLiveCD: Make sure livecd-rootfs is still installed in
 the chroot after the dist-upgrade.

---
 BuildLiveCD      | 1 +
 debian/changelog | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/BuildLiveCD b/BuildLiveCD
index 08cac9bd..31040267 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -112,6 +112,7 @@ for STE in $SUITES; do
     if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
     fi
 done
 for STE in $SUITES; do
diff --git a/debian/changelog b/debian/changelog
index 0ccd4d59..5190b570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ livecd-rootfs (2.22) UNRELEASED; urgency=low
   [ Adam Conrad ]
   * Switch a hardcoded "boot" to "$INITFS" in auto/build.
 
+  [ Colin Watson ]
+  * BuildLiveCD: Make sure livecd-rootfs is still installed in the chroot
+    after the dist-upgrade.
+
  -- Colin Watson <cjwatson@ubuntu.com>  Thu, 11 Aug 2011 12:18:21 +0100
 
 livecd-rootfs (2.21) oneiric; urgency=low