From 866bc342b7b76a9761df1aa6bd658fe65e373641 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 3 Nov 2006 12:27:32 +0100 Subject: [PATCH 1/1] use --- chroot-script | 6 +++--- config | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/chroot-script b/chroot-script index 20fa315..6b5b303 100644 --- a/chroot-script +++ b/chroot-script @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Nov 03 12:13:15 CET 2006 [mika] +# Latest change: Fre Nov 03 12:27:20 CET 2006 [mika] ################################################################################ set -e @@ -13,8 +13,8 @@ set -e [ -r /proc/1 ] || mount -t proc none /proc -if [ -n "MIRROR_LIST" ] ; then - echo $MIRROR_LIST > /etc/apt/sources.list +if [ -n "$CHROOTMIRROR" ] ; then + echo "$CHROOTMIRROR" > /etc/apt/sources.list fi # install additional packages diff --git a/config b/config index 956faae..732bcfd 100644 --- a/config +++ b/config @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Fre Nov 03 11:38:42 CET 2006 [mika] +# Latest change: Fre Nov 03 12:27:17 CET 2006 [mika] ################################################################################ ################################################################################ @@ -32,14 +32,12 @@ CONFFILES='/etc/debootstrap/' # mount point where chroot actions should take place MNTPOINT='/mnt/test' -# mirror (download packages from) +# set mirror where debootstrap should download packages from MIRROR='ftp://ftp.tugraz.at/mirror/debian' -# entries for /etc/apt/sources.list (if empty the default is taken) -MIRROR_LIST=" -deb http://ftp.tu-graz.ac.at/mirror/debian unstable main contrib non-free -deb http://ftp.de.debian.org/debian unstable main contrib non-free -" +# specify entry which should be used for /etc/apt/sources.list, +# if empty then any existing /etc/apt/sources.list will be taken +CHROOTMIRROR='deb ftp://ftp.tugraz.at/mirror/debian unstable main contrib non-free' # release (which Debian version should be installed) RELEASE='etch' -- 2.1.4