From ea4dcbc59f7218637892c7c0b619357119a34b80 Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont@ubuntu.com>
Date: Sat, 26 Jun 2010 07:37:46 -0600
Subject: [PATCH] Import patches-unapplied version 1.124 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 9109e956a9af4bb7fd0402376572278cf121c072

New changelog entries:
  * BuildLiveCD: update livecd chroot at start of run, for freshest
    livecd-rootfs package.
---
 BuildLiveCD      | 6 ++++++
 debian/changelog | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/BuildLiveCD b/BuildLiveCD
index d048e642..08ea9b96 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -97,6 +97,12 @@ trap "rm -f ~/buildLiveCD.lock; exit 1" 1 2 3 15
 exec > $BUILD_LOG 2>&1
 set -e
 
+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
+    fi
+done
 for STE in $SUITES; do
     if cd ~/build-${STE}-live 2>/dev/null; then
 	DIR=~/build-${STE}-live/chroot-${STE}/./build/
diff --git a/debian/changelog b/debian/changelog
index 0a5b9677..b892d70a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.124) maverick; urgency=low
+
+  * BuildLiveCD: update livecd chroot at start of run, for freshest
+    livecd-rootfs package.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat, 26 Jun 2010 07:37:46 -0600
+
 livecd-rootfs (1.123) maverick; urgency=low
 
   * Make sure LIVE_BOOT_SCRIPTS is always defined.