[SCM] debian-live/live-helper branch, master, updated. 1.0_a44-1-31-ge98676f

[Daniel Baumann]

The following commit has been merged in the master branch:
commit e98676f6b37d6668764d277552f878c2db1fad36
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Apr 22 18:23:34 2008 +0200

    Also taking mirrors from environment in image.sh.

diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index 89af7da..0088874 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -5,6 +5,9 @@ DISTRIBUTIONS="${DISTRIBUTIONS:-etch lenny sid}"
 FLAVOURS="${FLAVOURS:-standard gnome-desktop kde-desktop xfce-desktop}"
 SOURCE="${SOURCE:-enabled}"
 
+MIRROR="${MIRROR:-http://mirror/ftp.debian.org/debian/}"
+MIRROR_SECURITY="${MIRROR_SECURITY:-http://mirror/ftp.debian.org/debian-security/}"
+
 # Dynamic variables
 ARCHITECTURE="$(dpkg --print-architecture)"
 DATE="$(date +%Y%m%d)"
@@ -28,9 +31,9 @@ do
 
 		if [ "${SOURCE}" = "enabled" ]
 		then
-			lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --source enabled --mirror-bootstrap http://mirror/ftp.debian.org/debian/ --mirror-chroot http://mirror/ftp.debian.org/debian/ --mirror-chroot-security http://mirror/ftp.debian.org/debian-security/
+			lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --source enabled --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY}
 		else
-			lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --source disabled --mirror-bootstrap http://mirror/ftp.debian.org/debian/ --mirror-chroot http://mirror/ftp.debian.org/debian/ --mirror-chroot-security http://mirror/ftp.debian.org/debian-security/
+			lh config -d ${DISTRIBUTION} -p ${FLAVOUR} --cache-stages "bootstrap rootfs" --apt-recommends disabled --source disabled --mirror-bootstrap ${MIRROR} --mirror-chroot ${MIRROR} --mirror-chroot-security ${MIRROR_SECURITY}
 		fi
 
 		if [ "${DISTRIBUTION}" = "sid" ]

-- 
debian-live/live-helper