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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 098047a14b649f13a3c7ef533a751166edd045bb
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Jan 31 15:07:00 2010 -0400

    Use chroot dir for boostrap by default; fix sid chroot uses MIRROR_CHROOT

diff --git a/auto/config b/auto/config
index 32a1002..153a825 100755
--- a/auto/config
+++ b/auto/config
@@ -4,13 +4,12 @@ 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/
 
 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}}"
+MIRROR_BOOTSTRAP="${5:-${1:-$DEFAULT_CHROOT}}"
 
 if test "$MIRROR_CHROOT" = -; then
 	MIRROR_CHROOT="$DEFAULT_CHROOT"
@@ -25,7 +24,7 @@ if test "$MIRROR_BINARY_SECURITY" = -; then
 	MIRROR_BINARY_SECURITY="$DEFAULT_BINARY_SECURITY"
 fi
 if test "$MIRROR_BOOTSTRAP" = -; then
-	MIRROR_BOOTSTRAP="$DEFAULT_BOOTSTRAP"
+	MIRROR_BOOTSTRAP="$DEFAULT_CHROOT"
 fi
 
 #lh config noautoconfig \#
@@ -47,6 +46,6 @@ lh config \
 	--binary-indices none \
 	--packages-lists "standard" \
 	${@}
-echo -e "deb $MIRROR_BINARY sid main\ndeb-src $MIRROR_BINARY sid main" >config/chroot_sources/sid.chroot
+echo -e "deb $MIRROR_CHROOT sid main\ndeb-src $MIRROR_CHROOT 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.