diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-22 01:30:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:01:54 +0100 |
| commit | dd77597ac8bec568419a22afd793ba9e8bd04703 (patch) | |
| tree | da4fcc46962886956627925c32274320b55bc6bb | |
| parent | fcbe998101a0623c2ad7e29000c7d783e24d6620 (diff) | |
| download | live-build-dd77597ac8bec568419a22afd793ba9e8bd04703.zip live-build-dd77597ac8bec568419a22afd793ba9e8bd04703.tar.gz | |
lh_binary_debian-installer: Re-enable d-i on netboot images
This patch also modifies the configuration logic to ensure that setting
LH_DEBIAN_INSTALLER="enabled" whilst creating a netboot image will install
the netboot variety of d-i.
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 5b53858..7faead2 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -38,18 +38,9 @@ then WGET_OPTIONS="${WGET_OPTIONS} --quiet" fi -# Setting remote d-i directories +# Check d-i configuration case "${LH_DEBIAN_INSTALLER}" in - enabled|cdrom|netinst|businesscard|live) - DI="cdrom" - DI_GTK="${DI}/gtk" - DI_KERNEL="vmlinuz" - ;; - - netboot) - DI="netboot/debian-installer/${LH_ARCHITECTURE}" - DI_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}" - DI_KERNEL="linux" + enabled|cdrom|netinst|netboot|businesscard|live) ;; disabled) @@ -83,11 +74,7 @@ case "${LH_BINARY_IMAGES}" in ;; net) - DESTDIR="tftpboot" - DI="netboot" - - Echo_error "Not supported yet (FIXME)" - exit 1 + DESTDIR="tftpboot/debian-install/${LH_ARCHITECTURE}" ;; tar|usb-hdd) @@ -101,6 +88,20 @@ case "${LH_BINARY_IMAGES}" in ;; esac +# Setting remote d-i directories +case "${LH_BINARY_IMAGES}" in + net) + DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}" + DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}" + DI_REMOTE_KERNEL="linux" + ;; + *) + DI_REMOTE_BASE="cdrom" + DI_REMOTE_BASE_GTK="cdrom/gtk" + DI_REMOTE_KERNEL="vmlinuz" + ;; +esac + Check_multiarchitecture VMLINUZ_DI="vmlinuz" @@ -217,15 +218,15 @@ fi # Downloading debian-installer mkdir -p "${DESTDIR_DI}" -wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL} -wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz +wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} +wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz # Downloading graphical-installer if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ] then mkdir -p "${DESTDIR_GI}" - wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL} - wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz + wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} + wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz fi if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then |