* 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) UNRELEASED; 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:53:15 +0100
+
 livecd-rootfs (0.33) gutsy; urgency=low
 
   [ Adam Conrad ]

livecd.sh

@@ -66,6 +66,9 @@ export LANG=C
 SRCMIRROR=http://archive.ubuntu.com/ubuntu
 COMP="main restricted"
 ARCH=$(dpkg --print-installation-architecture)
+OPTMIRROR=
+
+select_mirror () {
     case $ARCH in
 	i386|amd64|sparc)
 	    case $FS in
@@ -103,6 +106,11 @@ case $(hostname --fqdn) in
 	*)			MIRROR=${USERMIRROR};;
     esac
 
+    if [ "$OPTMIRROR" ]; then
+	MIRROR="$OPTMIRROR"
+    fi
+}
+
 STE=gutsy
 EXCLUDE=""
 LIST=""
@@ -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