diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-22 18:09:46 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:24 +0100 |
| commit | 6057ecbd1932dcba85325b581f524544bbbca3d3 (patch) | |
| tree | 1da95fce7cac17cc6cc6acf8afe9dd9bdeac006d | |
| parent | 07c3a04027bb3243892ab2812558864330fac440 (diff) | |
| download | live-build-6057ecbd1932dcba85325b581f524544bbbca3d3.zip live-build-6057ecbd1932dcba85325b581f524544bbbca3d3.tar.gz | |
lh_binary_debian-installer: Merge pool/netboot determining logic
The code which determined whether to use the netboot d-i images was the
inverse of the code which determined whether to create a local package
pool: this patch merges the two.
This patch additionally ensures that setting "businesscard" whilst building
an ISO image will install the d-i netboot images; this was causing d-i
failures when it couldn't find its (non-existent) package pool.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index df16f98..d1913fa 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -91,11 +91,27 @@ esac # Setting remote d-i directories case "${LH_BINARY_IMAGES}" in net) + USE_NETBOOT_DI="yes" + ;; + *) + case "${LH_DEBIAN_INSTALLER}" in + businesscard|netboot) + USE_NETBOOT_DI="yes" + ;; + *) + USE_NETBOOT_DI="no" + ;; + esac + ;; +esac + +case "${USE_NETBOOT_DI}" in + yes) DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}" DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}" DI_REMOTE_KERNEL="linux" ;; - *) + no) DI_REMOTE_BASE="cdrom" DI_REMOTE_BASE_GTK="cdrom/gtk" DI_REMOTE_KERNEL="vmlinuz" @@ -233,24 +249,7 @@ then fi # Only download additional packages if appropriate -case "${LH_DEBIAN_INSTALLER}" in - enabled|cdrom|netinst) - case "${LH_BINARY_IMAGES}" in - net) - DI_PACKAGE_POOL="no" - ;; - *) - DI_PACKAGE_POOL="yes" - ;; - esac - ;; - - *) - DI_PACKAGE_POOL="no" - ;; -esac - -if [ "${DI_PACKAGE_POOL}" = "yes" ] +if [ "${USE_NETBOOT_DI}" = "no" ] then # Downloading additional packages mkdir -p chroot/binary.deb/archives/partial |