manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
Chris Lamb 2008-03-22 01:30:55 +00:00
parent 92edfe399b
commit 762613f277
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
helpers/lh_binary_debian-installer
View File

@ -38,18 +38,9 @@ then
WGET_OPTIONS="${WGET_OPTIONS} --quiet" WGET_OPTIONS="${WGET_OPTIONS} --quiet"
fi fi
# Setting remote d-i directories # Check d-i configuration
case "${LH_DEBIAN_INSTALLER}" in case "${LH_DEBIAN_INSTALLER}" in
enabled|cdrom|netinst|businesscard|live) enabled|cdrom|netinst|netboot|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"
;; ;;
disabled) disabled)
@ -83,11 +74,7 @@ case "${LH_BINARY_IMAGES}" in
;; ;;
net) net)
DESTDIR="tftpboot" DESTDIR="tftpboot/debian-install/${LH_ARCHITECTURE}"
DI="netboot"
Echo_error "Not supported yet (FIXME)"
exit 1
;; ;;
tar|usb-hdd) tar|usb-hdd)
@ -101,6 +88,20 @@ case "${LH_BINARY_IMAGES}" in
;; ;;
esac 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 Check_multiarchitecture
VMLINUZ_DI="vmlinuz" VMLINUZ_DI="vmlinuz"
@ -217,15 +218,15 @@ fi
# Downloading debian-installer # Downloading debian-installer
mkdir -p "${DESTDIR_DI}" mkdir -p "${DESTDIR_DI}"
wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL} 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}/initrd.gz wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
# Downloading graphical-installer # Downloading graphical-installer
if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ] if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then then
mkdir -p "${DESTDIR_GI}" 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}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
fi fi
if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then