From 106b4d38681537f3d80d99190d8ef5399e67ebe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org>
Date: Fri, 2 Oct 2009 01:41:41 +0200
Subject: [PATCH] Gross hack to reinstall the moblin-ppa-keyring package after
 the trusted db is put back in place since otherwise we miss the GPG key we
 wanted.

---
 debian/changelog | 2 ++
 livecd.sh        | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4462e223..c2d277c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ livecd-rootfs (0.99) UNRELEASED; urgency=low
     deb lines and having an useful comment in sources.list.
   * Create an etc/apt/preferences file Pin-ing the PPA at 550 when there's
     one.
+  * Gross hack to reinstall the moblin-ppa-keyring package after the trusted
+    db is put back in place since otherwise we miss the GPG key we wanted.
 
  -- Loïc Minier <loic.minier@ubuntu.com>  Thu, 24 Sep 2009 11:52:25 +0200
 
diff --git a/livecd.sh b/livecd.sh
index 91230b6f..11195f5f 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -517,6 +517,12 @@ Pin-Priority: 550
     fi
     mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 
+    # gross hack to re-register the GPG key
+    if [ "$FS" = "ubuntu-moblin-remix" ]; then
+	chroot $ROOT apt-get -y --force-yes install --reinstall ubuntu-moblin-ppa-keyring
+	chroot $ROOT apt-get update
+    fi
+
     # get rid of the .debs - we don't need them.
     chroot ${ROOT} apt-get clean
     rm -f ${ROOT}var/lib/apt/lists/*_*