From e5069315395797be0bf8f031d7c997be15959991 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 30 Sep 2010 11:59:22 +0200
Subject: [PATCH] * livecd.sh:   - Restore the keyring earlier in the chroot
 (before the dist-upgrade).     This fixes the missng key for the
 extras.ubuntu.com that is added     during the livecd build dist-ugprade (LP:
 #650525)

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

diff --git a/debian/changelog b/debian/changelog
index 2e376bf0..cdf35af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (1.152) UNRELEASED; urgency=low
+
+  * livecd.sh:
+    - Restore the keyring earlier in the chroot (before the dist-upgrade).
+      This fixes the missng key for the extras.ubuntu.com that is added
+      during the livecd build dist-ugprade (LP: #650525)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Sep 2010 11:48:36 +0200
+
 livecd-rootfs (1.151) maverick; urgency=low
 
   * enforce installation of only suitable header packages for the respective
diff --git a/livecd.sh b/livecd.sh
index a4120518..c7bc9b0a 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -507,7 +507,12 @@ Pin-Priority: 900
     cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
     cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
 
+    # update and immediately restore the trusted keyring
     chroot $ROOT apt-get update
+    # we restore the keyring here because on dist-upgrade the
+    # ubuntu-extras-keyring package installs additional keys
+    mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
+
     checkpoint "Upgrading"
     chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null
     checkpoint "Installing main packages"
@@ -645,7 +650,6 @@ Pin: release o=LP-PPA-$origin
 Pin-Priority: 550
 @@EOF
     fi
-    mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 
     # get rid of the .debs - we don't need them.
     chroot ${ROOT} apt-get clean