diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-14 16:41:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:34 +0100 |
| commit | 25ad66e62d7dbef9d2c99a4de1ad65a2de55eccf (patch) | |
| tree | bb5733c71c44533b7d403e7f22ffc259511bed95 | |
| parent | a1caf63a92eb6ed359ba46e0e5ad2180880e5599 (diff) | |
| download | live-build-25ad66e62d7dbef9d2c99a4de1ad65a2de55eccf.zip live-build-25ad66e62d7dbef9d2c99a4de1ad65a2de55eccf.tar.gz | |
Rename USE_NETBOOT_DI to DI_IMAGE_TYPE
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index e5d0bc1..4c4c2b8 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -95,27 +95,27 @@ esac # Setting remote d-i directories case "${LH_BINARY_IMAGES}" in net) - USE_NETBOOT_DI="yes" + DI_IMAGE_TYPE="netboot" ;; *) case "${LH_DEBIAN_INSTALLER}" in businesscard|netboot) - USE_NETBOOT_DI="yes" + DI_IMAGE_TYPE="netboot" ;; *) - USE_NETBOOT_DI="no" + DI_IMAGE_TYPE="cdrom" ;; esac ;; esac -case "${USE_NETBOOT_DI}" in - yes) +case "${DI_IMAGE_TYPE}" in + netboot) DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}" DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}" DI_REMOTE_KERNEL="linux" ;; - no) + cdrom) DI_REMOTE_BASE="cdrom" DI_REMOTE_BASE_GTK="cdrom/gtk" DI_REMOTE_KERNEL="vmlinuz" @@ -253,7 +253,7 @@ then fi # Only download additional packages if appropriate -if [ "${USE_NETBOOT_DI}" = "no" ] +if [ "${DI_IMAGE_TYPE}" != "netboot" ] then # Downloading additional packages mkdir -p chroot/binary.deb/archives/partial @@ -482,7 +482,7 @@ Repack_initrd() } # Preseed d-i by repacking the initrd in certain situations -if [ "${USE_NETBOOT_DI}" = "yes" ] && [ -e config/binary_debian-installer/preseed.cfg ] +if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/binary_debian-installer/preseed.cfg ] then Repack_initrd "${DESTDIR}"/"${INITRD_DI}" |