diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-04 13:22:15 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | 5ab772d8c9f026591e19459d366a64a88a482c29 (patch) | |
| tree | fe5a1546319d2164f0e29b74559dc429a676a712 /helpers | |
| parent | 9aaba9712a2e4099f103a9ad69ef80bba147d05c (diff) | |
| download | live-build-5ab772d8c9f026591e19459d366a64a88a482c29.zip live-build-5ab772d8c9f026591e19459d366a64a88a482c29.tar.gz | |
Applying slightly modified patch from Cody A.W. Somerville <cody.somerville@canonical.com> to add support for custom debian installer images mirror.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/binary_debian-installer | 2 | ||||
| -rwxr-xr-x | helpers/config | 12 |
2 files changed, 12 insertions, 2 deletions
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}" |