[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-1-gc7bcd89

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c7bcd899f0b3b53e9fa9297494ae93bf36ee8ca0
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 4 13:22:15 2010 +0100

    Applying slightly modified patch from Cody A.W. Somerville <cody.somerville at canonical.com> to add support for custom debian installer images mirror.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 140cc65..2ee4a11 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -385,6 +385,8 @@ Set_defaults ()
 		esac
 	fi
 
+	LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_BOOTSTRAP}}"
+
 	# Setting archive areas value
 	if [ -z "${LH_ARCHIVE_AREAS}" ]
 	then
diff --git a/helpers/binary_debian-installer b/helpers/binary_debian-installer
index d525ca6..67d38a3 100755
--- a/helpers/binary_debian-installer
+++ b/helpers/binary_debian-installer
@@ -261,7 +261,7 @@ then
 			;;
 	esac
 else
-	URL="${LH_MIRROR_CHROOT}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
+	URL="${LH_MIRROR_DEBIAN_INSTALLER}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
 fi
 
 mkdir -p "${DESTDIR_DI}"
diff --git a/helpers/config b/helpers/config
index 2d7903c..3a67b94 100755
--- a/helpers/config
+++ b/helpers/config
@@ -93,6 +93,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--mirror-chroot-security URL]\n\
 \t    [--mirror-binary URL]\n\
 \t    [--mirror-binary-security URL]\n\
+\t    [--mirror-debian-installer URL]\n\
 \t    [--mode debian|emdebian]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
@@ -134,7 +135,7 @@ Local_arguments ()
 		initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
-		mirror-binary-security:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
+		mirror-binary-security:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
 		packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
 		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@@ -415,6 +416,11 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--mirror-debian-installer)
+				LH_MIRROR_DEBIAN_INSTALLER="${2}"
+				shift 2
+				;;
+
 			--archive-areas)
 				LH_ARCHIVE_AREAS="${2}"
 				shift 2
@@ -978,6 +984,10 @@ LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
 # (Default: ${LH_MIRROR_BINARY_SECURITY})
 LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
 
+# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# (Default: ${LH_MIRROR_BOOTSTRAP})
+LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
+
 # \$LH_ARCHIVE_AREAS: select archive areas to use
 # (Default: ${LH_ARCHIVE_AREAS})
 LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 3a3e4cf..9cf53c1 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -134,6 +134,8 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
 .br
+	[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
+.br
 	[\fB\-\-mode\fR debian|emdebian|ubuntu]
 .br
 	[\fB\-\-net\-root\-filesystem\fR nfs|cfs]
@@ -334,6 +336,8 @@ sets the location of the debian security package mirror that should end up confi
 sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://ftp.us.debian.org/debian/ which may not be a good default if you live outside the U.S.
 .IP "\fB\-\-mirror\-chroot\-security\fR \fIURL\fR" 4
 sets the location of the debian security package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://security.debian.org/debian/.
+.IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
+sets the location of the mirror that will be used to fetch the debian installer images. By default, this points to the same mirror used to build the live system.
 .IP "\fB\-\-mode\fR debian|emdebian|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
 .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4

-- 
live-helper