diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-25 04:03:05 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-05 11:48:04 +0000 |
| commit | 2f5ae873b0d0cb0a0f94ba03a279db09fdeb5fa6 (patch) | |
| tree | 6d5b1e87d5fa67a61bf89a29c4cd83a5748dab84 /scripts/build | |
| parent | 3897aac77a808dac94321d677458c45780a3e405 (diff) | |
| download | vyos-live-build-2f5ae873b0d0cb0a0f94ba03a279db09fdeb5fa6.tar.gz vyos-live-build-2f5ae873b0d0cb0a0f94ba03a279db09fdeb5fa6.zip | |
bootloaders: fix ignoring LB_DEBIAN_INSTALLER_GUI in menu creation
LB_DEBIAN_INSTALLER_GUI defines whether or not to provide the graphical
installer. the installer_debian-installer script pays attention to it and
does not download it if not wanted. the actual bootloaders however
(both grub2/loopback and syslinux) ignore it, which leaves broken and
unwanted menu entries. this fixes that.
Gbp-Dch: Short
Closes: #952890
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 29 | ||||
| -rwxr-xr-x | scripts/build/binary_syslinux | 9 |
2 files changed, 28 insertions, 10 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index a390057b3..d126d9ced 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -247,16 +247,25 @@ then INITRD_GI="/install/gtk/initrd.gz" APPEND_GI="video=vesa:ywrap,mtrr vga=788 quiet ${LB_BOOTAPPEND_INSTALL}" - Grub_install_entry "Start installer" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}" - - Grub_install_entry "Install in graphical mode" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}" - Grub_install_entry "Install in text mode" "install" "${KERNEL_DI}" "${INITRD_DI}" "${APPEND_DI}" - Grub_install_entry "Expert install in graphical mode" "expertgui" "${KERNEL_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}" - Grub_install_entry "Expert install in text mode" "expert" "${KERNEL_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}" - Grub_install_entry "Automatic install in graphical mode" "autogui" "${KERNEL_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}" - Grub_install_entry "Automatic install in text mode" "auto" "${KERNEL_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}" - Grub_install_entry "Rescue system in graphical mode" "rescuegui" "${KERNEL_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}" - Grub_install_entry "Rescue system in text mode" "rescue" "${KERNEL_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" + if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]; then + Grub_install_entry "Start installer" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}" + + Grub_install_entry "Install in graphical mode" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}" + Grub_install_entry "Install in text mode" "install" "${KERNEL_DI}" "${INITRD_DI}" "${APPEND_DI}" + Grub_install_entry "Expert install in graphical mode" "expertgui" "${KERNEL_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}" + Grub_install_entry "Expert install in text mode" "expert" "${KERNEL_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}" + Grub_install_entry "Automatic install in graphical mode" "autogui" "${KERNEL_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}" + Grub_install_entry "Automatic install in text mode" "auto" "${KERNEL_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}" + Grub_install_entry "Rescue system in graphical mode" "rescuegui" "${KERNEL_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}" + Grub_install_entry "Rescue system in text mode" "rescue" "${KERNEL_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" + else + Grub_install_entry "Start installer" "install" "${KERNEL_DI}" "${INITRD_DI}" "${APPEND_DI}" + + Grub_install_entry "Install in text mode" "install" "${KERNEL_DI}" "${INITRD_DI}" "${APPEND_DI}" + Grub_install_entry "Expert install in text mode" "expert" "${KERNEL_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}" + Grub_install_entry "Automatic install in text mode" "auto" "${KERNEL_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}" + Grub_install_entry "Rescue system in text mode" "rescue" "${KERNEL_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}" + fi fi # Assembling memtest configuration diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 49aa6eb79..e863eb505 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -150,6 +150,15 @@ case "${LB_BUILD_WITH_CHROOT}" in ;; esac +# Use correct install menu set +if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]; then + rm "${_TARGET}"/install_text.cfg + mv "${_TARGET}"/install_gui.cfg "${_TARGET}"/install.cfg +else + rm "${_TARGET}"/install_gui.cfg + mv "${_TARGET}"/install_text.cfg "${_TARGET}"/install.cfg +fi + # Configuring files if [ -e "${_TARGET}/live.cfg.in" ] then |