Import patches-unapplied version 0.34 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: 46ce707e6d

New changelog entries:
  * Rearrange lpia mirror selection hacks to work properly; FS isn't set
    until a bit later on.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (0.34) gutsy; urgency=low
+
+  * Rearrange lpia mirror selection hacks to work properly; FS isn't set
+    until a bit later on.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 08 Sep 2007 22:56:32 +0100
+
 livecd-rootfs (0.33) gutsy; urgency=low
 
   [ Adam Conrad ]

livecd.sh

@@ -66,42 +66,50 @@ export LANG=C
 SRCMIRROR=http://archive.ubuntu.com/ubuntu
 COMP="main restricted"
 ARCH=$(dpkg --print-installation-architecture)
-case $ARCH in
-    i386|amd64|sparc)
-	case $FS in
-	    ubuntu-lpia)
-		USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
-		SECMIRROR=${USERMIRROR}
-		SECSRCMIRROR=${SRCMIRROR}
-		;;
-	    *)
-		USERMIRROR=http://archive.ubuntu.com/ubuntu
-		SECMIRROR=http://security.ubuntu.com/ubuntu
-		SECSRCMIRROR=${SECMIRROR}
-		;;
-	esac
-	;;
-    hppa)
-    	USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
-    	SECMIRROR=${USERMIRROR}
-	SECSRCMIRROR=${SRCMIRROR}
-	#COMP="main restricted universe"
-	;;
-    *)
-    	USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
-    	SECMIRROR=${USERMIRROR}
-	SECSRCMIRROR=${SRCMIRROR}
-	;;
-esac
-case $(hostname --fqdn) in
-    bld-*.mmjgroup.com)	MIRROR=${USERMIRROR};;
-    *.mmjgroup.com)	MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};;
-    *.0c3.net)		MIRROR=http://ftp.iinet.net.au/linux/ubuntu;;
-    *.ubuntu.com)	MIRROR=http://ftpmaster.internal/ubuntu;;
-    *.warthogs.hbd.com)	MIRROR=http://ftpmaster.internal/ubuntu;;
-    *.buildd)		MIRROR=http://ftpmaster.internal/ubuntu;;
-    *)			MIRROR=${USERMIRROR};;
-esac
+OPTMIRROR=
+
+select_mirror () {
+    case $ARCH in
+	i386|amd64|sparc)
+	    case $FS in
+		ubuntu-lpia)
+		    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
+		    SECMIRROR=${USERMIRROR}
+		    SECSRCMIRROR=${SRCMIRROR}
+		    ;;
+		*)
+		    USERMIRROR=http://archive.ubuntu.com/ubuntu
+		    SECMIRROR=http://security.ubuntu.com/ubuntu
+		    SECSRCMIRROR=${SECMIRROR}
+		    ;;
+	    esac
+	    ;;
+	hppa)
+	    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
+	    SECMIRROR=${USERMIRROR}
+	    SECSRCMIRROR=${SRCMIRROR}
+	    #COMP="main restricted universe"
+	    ;;
+	*)
+	    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
+	    SECMIRROR=${USERMIRROR}
+	    SECSRCMIRROR=${SRCMIRROR}
+	    ;;
+    esac
+    case $(hostname --fqdn) in
+	bld-*.mmjgroup.com)	MIRROR=${USERMIRROR};;
+	*.mmjgroup.com)		MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};;
+	*.0c3.net)		MIRROR=http://ftp.iinet.net.au/linux/ubuntu;;
+	*.ubuntu.com)		MIRROR=http://ftpmaster.internal/ubuntu;;
+	*.warthogs.hbd.com)	MIRROR=http://ftpmaster.internal/ubuntu;;
+	*.buildd)		MIRROR=http://ftpmaster.internal/ubuntu;;
+	*)			MIRROR=${USERMIRROR};;
+    esac
+
+    if [ "$OPTMIRROR" ]; then
+	MIRROR="$OPTMIRROR"
+    fi
+}
 
 STE=gutsy
 EXCLUDE=""
@@ -113,7 +121,7 @@ while getopts :d:e:i:I:mS::s: name; do case $name in
     e)  EXCLUDE="$EXCLUDE $OPTARG";;
     i)  LIST="$LIST $OPTARG";;
     I)	UINUM=$(sanitize int "$OPTARG");;
-    m)	MIRROR=$(sanitize url "$OPTARG");;
+    m)	OPTMIRROR=$(sanitize url "$OPTARG");;
     S)	USZ=$(sanitize int "$OPTARG");;
     s)	SUBARCH="$OPTARG";;
     \?) echo bad usage >&2; exit 2;;
@@ -146,6 +154,8 @@ for FS in "$@"; do
     MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys"
     DEV=""
 
+    select_mirror
+
     rm -rf ${ROOT}
 
     mkdir -p ${ROOT}var/cache/debconf
@@ -314,7 +324,7 @@ link_in_boot = $link_in_boot
 	chroot $ROOT dpkg-divert --remove --rename /${file}
     done
 
-    # And make this look more pristene
+    # And make this look more pristine
     cleanup
     cat << @@EOF > ${ROOT}etc/apt/sources.list
 deb ${USERMIRROR} $STE ${COMP}
@@ -364,7 +374,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
 	ln -s livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd
 	ln -s livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel
     fi
-    # all done with the chroot; reset the deconf frontend, so Colin doesn't cry
+    # all done with the chroot; reset the debconf frontend, so Colin doesn't cry
     echo RESET debconf/frontend | chroot $ROOT debconf-communicate
     echo FSET debconf/frontend seen true | chroot $ROOT debconf-communicate