[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-84-gcb62fcb

[Darren Salt]

The following commit has been merged in the master branch:
commit cb62fcb68e00d92bd6495ea1ad570a452849eb10
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sun Jan 31 18:13:37 2010 +0000

    Allow full overriding of mirror URLs.

diff --git a/auto/config b/auto/config
index 19aae9a..32a1002 100755
--- a/auto/config
+++ b/auto/config
@@ -1,9 +1,35 @@
 #!/bin/sh
 
-MIRROR_DEBIAN="${1:-http://debian.mirror.rafal.ca/debian/}"
-MIRROR_SECURITY="${2:-http://debian.mirror.rafal.ca/debian-security/}"
+DEFAULT_CHROOT=http://debian.mirror.rafal.ca/debian/
+DEFAULT_CHROOT_SECURITY=http://debian.mirror.rafal.ca/debian-security/
+DEFAULT_BINARY=http://cdn.debian.net/debian/
+DEFAULT_BINARY_SECURITY=http://security.debian.org/
+DEFAULT_BOOTSTRAP=http://cdn.debian.net/debian/
 
-lh config noautoconfig \
+MIRROR_CHROOT="${1:-$DEFAULT_CHROOT}"
+MIRROR_CHROOT_SECURITY="${2:-$DEFAULT_CHROOT_SECURITY}"
+MIRROR_BINARY="${3:-${1:-$DEFAULT_BINARY}}"
+MIRROR_BINARY_SECURITY="${4:-${1:-$DEFAULT_BINARY_SECURITY}}"
+MIRROR_BOOTSTRAP="${5:-${1:-$DEFAULT_BOOTSTRAP}}"
+
+if test "$MIRROR_CHROOT" = -; then
+	MIRROR_CHROOT="$DEFAULT_CHROOT"
+fi
+if test "$MIRROR_CHROOT_SECURITY" = -; then
+	MIRROR_CHROOT_SECURITY="$DEFAULT_CHROOT_SECURITY"
+fi
+if test "$MIRROR_BINARY" = -; then
+	MIRROR_BINARY="$DEFAULT_BINARY"
+fi
+if test "$MIRROR_BINARY_SECURITY" = -; then
+	MIRROR_BINARY_SECURITY="$DEFAULT_BINARY_SECURITY"
+fi
+if test "$MIRROR_BOOTSTRAP" = -; then
+	MIRROR_BOOTSTRAP="$DEFAULT_BOOTSTRAP"
+fi
+
+#lh config noautoconfig \#
+lh config \
 	--architecture i386 \
 	--apt-recommends false \
 	--bootappend-live 'noautologin acpi_osi="Linux" rfkill.default_state=1' \
@@ -13,12 +39,14 @@ lh config noautoconfig \
         --archive-areas "main non-free" \
 	--linux-packages "linux-image-2.6" \
 	--memtest none \
-	--mirror-bootstrap ${MIRROR_DEBIAN} \
-	--mirror-chroot ${MIRROR_DEBIAN} \
-	--mirror-chroot-security ${MIRROR_SECURITY} \
+	--mirror-bootstrap ${MIRROR_BOOTSTRAP} \
+	--mirror-chroot ${MIRROR_CHROOT} \
+	--mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \
+	--mirror-binary ${MIRROR_BINARY} \
+	--mirror-binary-security ${MIRROR_BINARY_SECURITY} \
 	--binary-indices none \
 	--packages-lists "standard" \
 	${@}
-echo -e "deb $MIRROR_DEBIAN sid main\ndeb-src $MIRROR_DEBIAN sid main" >config/chroot_sources/sid.chroot
-echo -e "deb http://cdn.debian.net/debian sid main\ndeb-src http://cdn.debian.net/debian sid main" >config/chroot_sources/sid.binary
+echo -e "deb $MIRROR_BINARY sid main\ndeb-src $MIRROR_BINARY sid main" >config/chroot_sources/sid.chroot
+echo -e "deb $MIRROR_BINARY sid main\ndeb-src $MIRROR_BINARY sid main" >config/chroot_sources/sid.binary
 

-- 
A live-helper based Debian live & installer image for the Eee PC.