Hi Daniel,
On Wed, Feb 17, 2010 at 6:55 AM, Daniel Baumann <dan...@debian.org> wrote:
> On 12/17/2009 01:33 PM, Daniel Baumann wrote:
>
>> great, but could you please rebase it on current git, so that it's
>> apply-able?
>>
>
> ping.
>
Please find updated patch attached.
Cheers,
--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-613-401-5141
Email: cody.somervi...@canonical.com
=== modified file 'functions/defaults.sh'
--- functions/defaults.sh 2010-02-21 13:16:56 +0000
+++ functions/defaults.sh 2010-02-22 18:18:23 +0000
@@ -306,6 +306,7 @@
fi
LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT:-${LH_MIRROR_BOOTSTRAP}}"
+ LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_CHROOT}}"
# Setting security mirror to fetch packages from
if [ -z "${LH_MIRROR_CHROOT_SECURITY}" ]
=== modified file 'helpers/config'
--- helpers/config 2010-02-17 11:30:07 +0000
+++ helpers/config 2010-02-22 18:22:50 +0000
@@ -93,6 +93,7 @@
\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,10 +135,10 @@
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:,
- 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:,
+ 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:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
@@ -415,6 +416,11 @@
shift 2
;;
+ --mirror-debian-installer)
+ LH_MIRROR_DEBIAN_INSTALLER="${2}"
+ shift 2
+ ;;
+
--archive-areas)
LH_ARCHIVE_AREAS="${2}"
shift 2
@@ -1109,6 +1115,10 @@
# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
LH_CHROOT_BUILD="${LH_CHROOT_BUILD}"
+# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer suite
+# (Default: ${LH_MIRROR_CHROOT})
+LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
+
# \$LH_DEBIAN_INSTALLER: set debian-installer
# (Default: ${LH_DEBIAN_INSTALLER})
LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
=== modified file 'manpages/lh_config.en.1'
--- manpages/lh_config.en.1 2010-02-20 16:57:32 +0000
+++ manpages/lh_config.en.1 2010-02-22 18:19:20 +0000
@@ -134,6 +134,8 @@
.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 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
