From bca8c7f54fc4895a61001f38158d91f3df453566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org>
Date: Thu, 1 Oct 2009 23:47:16 +0200
Subject: [PATCH] Rename EXTRASOURCE to PPA and also define PPAMIRROR near top,
 set to ppa.launchpad.net.  Changing to PPA avoids listing non-main components
 in deb lines and having an useful comment in sources.list.

---
 debian/changelog |  3 +++
 livecd.sh        | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cc488e8..07343311 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ livecd-rootfs (0.99) UNRELEASED; urgency=low
     dir and hence would mask the previous builds; and even if that would be
     fixed, arch-indepedent filenames such as manifest/kernel/initrd/etc.
     symlinks would clash.
+  * Rename EXTRASOURCE to PPA and also define PPAMIRROR near top, set to
+    ppa.launchpad.net.  Changing to PPA avoids listing non-main components in
+    deb lines and having an useful comment in sources.list.
 
  -- Loïc Minier <loic.minier@ubuntu.com>  Thu, 24 Sep 2009 11:52:25 +0200
 
diff --git a/livecd.sh b/livecd.sh
index 70cf6f7e..ebd2936f 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -68,6 +68,7 @@ export DEBIAN_FRONTEND=noninteractive
 export LANG=C
 export CASPER_GENERATE_UUID=1
 SRCMIRROR=http://archive.ubuntu.com/ubuntu
+PPAMIRROR=ppa.launchpad.net
 ARCH=$(dpkg --print-architecture)
 OPTMIRROR=
 INITRD_COMPRESSOR=lzma
@@ -117,7 +118,7 @@ EXCLUDE=""
 LIST=""
 SUBARCH=""
 PROPOSED=""
-EXTRASOURCE=""
+PPA=""
 
 while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
     d)  STE=$OPTARG;;
@@ -221,7 +222,7 @@ Flags: seen
 	    LIST="$LIST minimal^ ubuntu-moblin-remix"
 	    LIVELIST="ubuntu-moblin-live"
 	    COMP="main restricted universe"
-	    EXTRASOURCE="http://ppa.launchpad.net/moblin/ppa/ubuntu/"
+	    PPA="moblin/ppa"
 	    ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
@@ -379,8 +380,8 @@ Pin-Priority: 900
     if [ "$PROPOSED" = "yes" ]; then
         echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
     fi
-    if [ -n "$EXTRASOURCE" ]; then
-	echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list
+    if [ -n "$PPA" ]; then
+        echo deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main >> ${ROOT}etc/apt/sources.list
     fi
     chroot $ROOT apt-get update
     if [ "$FS" = "ubuntu-moblin-remix" ]; then
@@ -491,8 +492,14 @@ ${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates multiverse
 ${COMMENT}deb ${SECMIRROR} ${STE}-security multiverse
 ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
 @@EOF
-    if [ -n "$EXTRASOURCE" ]; then
-	echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list
+    if [ -n "$PPA" ]; then
+    cat << @@EOF >> ${ROOT}etc/apt/sources.list
+
+## The following unsupported and untrusted Personal Archives (PPAs) were used
+## to create the base image of this system
+deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main
+deb-src http://$PPAMIRROR/$PPA/ubuntu ${STE} main
+@@EOF
     fi
     mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg