Import patches-unapplied version 0.59 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 61a11da916

New changelog entries:
  [ Colin Watson ]
  * Remove /boot/initrd.img-*.bak (LP: #64887).
  [ Adam Conrad ]
  * Resurrect the proposed option for livecd.sh/BuildLiveCD, so
    we can build test images that include packages from proposed.
  * Build with updates and security by default, which is a no-op
    on development releases (where these suites are empty), but
    a necessity for point-release image building.
  * Copy bin/true from the chroot, not from the real root, so
    image builds for i386/lpia work on amd64, as intended.

debian/changelog

@@ -1,3 +1,19 @@
+livecd-rootfs (0.59) intrepid; urgency=low
+
+  [ Colin Watson ]
+  * Remove /boot/initrd.img-*.bak (LP: #64887).
+
+  [ Adam Conrad ]
+  * Resurrect the proposed option for livecd.sh/BuildLiveCD, so
+    we can build test images that include packages from proposed.
+  * Build with updates and security by default, which is a no-op
+    on development releases (where these suites are empty), but
+    a necessity for point-release image building.
+  * Copy bin/true from the chroot, not from the real root, so
+    image builds for i386/lpia work on amd64, as intended.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 10 Jun 2008 13:23:18 -0600
+
 livecd-rootfs (0.58) intrepid; urgency=low
 
   * Fix up BuildLiveCD to only pass -a$ARCH when building for intrepid,

livecd.sh

@@ -112,8 +112,9 @@ STE=gutsy
 EXCLUDE=""
 LIST=""
 SUBARCH=""
+PROPOSED=""
 
-while getopts :d:e:i:I:m:S:s:a: name; do case $name in
+while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
     d)  STE=$OPTARG;;
     e)  EXCLUDE="$EXCLUDE $OPTARG";;
     i)  LIST="$LIST $OPTARG";;
@@ -122,6 +123,7 @@ while getopts :d:e:i:I:m:S:s:a: name; do case $name in
     S)	USZ="$OPTARG";;
     s)	SUBARCH="$OPTARG";;
     a)	ARCH="$OPTARG";;
+    p)  PROPOSED="yes";;
     \?) echo bad usage >&2; exit 2;;
     \:) echo missing argument >&2; exit 2;;
 esac; done;
@@ -237,7 +239,7 @@ Flags: seen
     for file in $DIVERTS; do
 	mkdir -p ${ROOT}${file%/*}
 	chroot $ROOT dpkg-divert --add --local --divert /${file}.livecd --rename /${file}
-	cp /bin/true ${ROOT}$file
+	cp ${ROOT}/bin/true ${ROOT}$file
     done
 
     # /bin/true won't cut it for mkinitrd, need to have -o support.
@@ -303,7 +305,13 @@ link_in_boot = $link_in_boot
 
     # Create a good sources.list, and finish the install
     echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list
+    echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list
+    echo deb $MIRROR ${STE}-updates ${COMP} >> ${ROOT}etc/apt/sources.list
+    if [ "$PROPOSED" = "yes" ]; then
+        echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
+    fi
     chroot $ROOT apt-get update
+    chroot $ROOT apt-get -y --purge dist-upgrade </dev/null
     chroot $ROOT apt-get -y install $LIST </dev/null
     chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 	> livecd.${FSS}.manifest-desktop
@@ -339,6 +347,14 @@ link_in_boot = $link_in_boot
 deb ${USERMIRROR} $STE ${COMP}
 deb-src ${SRCMIRROR} $STE ${COMP}
 
+deb ${SECMIRROR} ${STE}-security ${COMP}
+deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb ${USERMIRROR} ${STE}-updates ${COMP}
+deb-src ${USERMIRROR} ${STE}-updates ${COMP}
+
 ## Uncomment the following two lines to add software from the 'universe'
 ## repository.
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
@@ -348,9 +364,10 @@ deb-src ${SRCMIRROR} $STE ${COMP}
 ## team.
 # deb ${USERMIRROR} $STE universe
 # deb-src ${SRCMIRROR} $STE universe
-
+# deb ${USERMIRROR} ${STE}-updates universe
-deb ${SECMIRROR} ${STE}-security ${COMP}
+# deb-src ${USERMIRROR} ${STE}-updates universe
-deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
+# deb ${USERMIRROR} ${STE}-security universe
+# deb-src ${USERMIRROR} ${STE}-security universe
 @@EOF
     mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 
@@ -376,6 +393,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
 	chroot ${ROOT} update-initramfs -k "${KVER}" -u
 	# we mv the initramfs, so it's not wasting space on the livefs
 	mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}"
+	rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak
 	cp ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
     done
     NUMKVERS="$(set -- $KVERS; echo $#)"