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
This commit is contained in:
parent
3897aac77a
commit
2f5ae873b0
|
@ -247,6 +247,7 @@ then
|
|||
INITRD_GI="/install/gtk/initrd.gz"
|
||||
APPEND_GI="video=vesa:ywrap,mtrr vga=788 quiet ${LB_BOOTAPPEND_INSTALL}"
|
||||
|
||||
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}"
|
||||
|
@ -257,6 +258,14 @@ then
|
|||
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
label install
|
||||
menu label ^Install
|
||||
linux /install/vmlinuz
|
||||
initrd /install/initrd.gz
|
||||
append vga=788 @APPEND_INSTALL@ --- quiet
|
|
@ -0,0 +1,5 @@
|
|||
label install
|
||||
menu label ^Install
|
||||
linux /install/vmlinuz
|
||||
initrd /install/initrd.gz
|
||||
append vga=788 @APPEND_INSTALL@ --- quiet
|
|
@ -0,0 +1,5 @@
|
|||
label install
|
||||
menu label ^Install
|
||||
linux /install/vmlinuz
|
||||
initrd /install/initrd.gz
|
||||
append vga=788 @APPEND_INSTALL@ --- quiet
|
|
@ -0,0 +1,5 @@
|
|||
label install
|
||||
menu label ^Install
|
||||
linux /install/vmlinuz
|
||||
initrd /install/initrd.gz
|
||||
append vga=788 @APPEND_INSTALL@ --- quiet
|
Loading…
Reference in New Issue