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

This commit is contained in:
Daniel Baumann 2010-03-04 13:22:15 +01:00
parent a3c69af546
commit c7bcd899f0
4 changed files with 18 additions and 2 deletions

View File

@ -385,6 +385,8 @@ Set_defaults ()
esac esac
fi fi
LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER:-${LH_MIRROR_BOOTSTRAP}}"
# Setting archive areas value # Setting archive areas value
if [ -z "${LH_ARCHIVE_AREAS}" ] if [ -z "${LH_ARCHIVE_AREAS}" ]
then then

View File

@ -261,7 +261,7 @@ then
;; ;;
esac esac
else 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 fi
mkdir -p "${DESTDIR_DI}" mkdir -p "${DESTDIR_DI}"

View File

@ -93,6 +93,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-chroot-security URL]\n\ \t [--mirror-chroot-security URL]\n\
\t [--mirror-binary URL]\n\ \t [--mirror-binary URL]\n\
\t [--mirror-binary-security URL]\n\ \t [--mirror-binary-security URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian|emdebian]\n\ \t [--mode debian|emdebian]\n\
\t [--net-root-filesystem nfs|cfs]\n\ \t [--net-root-filesystem nfs|cfs]\n\
\t [--net-root-mountoptions OPTIONS]\n\ \t [--net-root-mountoptions OPTIONS]\n\
@ -134,7 +135,7 @@ Local_arguments ()
initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:, initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean, templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:, 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:, gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:, packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:, binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@ -415,6 +416,11 @@ Local_arguments ()
shift 2 shift 2
;; ;;
--mirror-debian-installer)
LH_MIRROR_DEBIAN_INSTALLER="${2}"
shift 2
;;
--archive-areas) --archive-areas)
LH_ARCHIVE_AREAS="${2}" LH_ARCHIVE_AREAS="${2}"
shift 2 shift 2
@ -978,6 +984,10 @@ LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
# (Default: ${LH_MIRROR_BINARY_SECURITY}) # (Default: ${LH_MIRROR_BINARY_SECURITY})
LH_MIRROR_BINARY_SECURITY="${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 # \$LH_ARCHIVE_AREAS: select archive areas to use
# (Default: ${LH_ARCHIVE_AREAS}) # (Default: ${LH_ARCHIVE_AREAS})
LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}" LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"

View File

@ -133,6 +133,8 @@ lh_config \- create configuration for live\-helper
[\fB\-\-mirror\-chroot\fR \fIURL\fR] [\fB\-\-mirror\-chroot\fR \fIURL\fR]
.br .br
[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR] [\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
.br
[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
.br .br
[\fB\-\-mode\fR debian|emdebian|ubuntu] [\fB\-\-mode\fR debian|emdebian|ubuntu]
.br .br
@ -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. 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 .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/. 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 .IP "\fB\-\-mode\fR debian|emdebian|ubuntu" 4
defines a global mode to load project specific defaults. By default this is set to debian. 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 .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4