From da1105ea4786fc94bb437d95cef83db9916ccb6f Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 21 Jul 2010 01:07:30 +0200
Subject: [PATCH] One more fix; if we're asking apt to downgrade packages, we
 have to explicitly pass --force-yes.

---
 debian/changelog | 7 +++++++
 livecd.sh        | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bffd2025..374c08ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.136) UNRELEASED; urgency=low
+ 
+  * One more fix; if we're asking apt to downgrade packages, we have to
+    explicitly pass --force-yes.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 21 Jul 2010 00:29:59 +0200
+
 livecd-rootfs (1.135) maverick; urgency=low
 
   * Implement the -a option in the right place - in livecd.sh, not in
diff --git a/livecd.sh b/livecd.sh
index 13423e83..ee8a2175 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -460,6 +460,7 @@ Package: *
 Pin: origin $APT_PIN
 Pin-Priority: 1001
 @@EOF
+	FORCE_YES=--force-yes
     fi
 
     if [ "$FS" = "ubuntu-moblin-remix" ]; then
@@ -477,7 +478,7 @@ Pin-Priority: 1001
     cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
 
     chroot $ROOT apt-get update
-    chroot $ROOT apt-get -y --purge dist-upgrade </dev/null
+    chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null
     chroot $ROOT apt-get -y --purge install $LIST </dev/null
 
     # launchpad likes to put dependencies of seeded packages in tasks along with the