From 2f5ae873b0d0cb0a0f94ba03a279db09fdeb5fa6 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Tue, 25 Feb 2020 04:03:05 +0000 Subject: 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 --- share/bootloaders/syslinux/install.cfg | 11 ----------- share/bootloaders/syslinux/install_gui.cfg | 11 +++++++++++ share/bootloaders/syslinux/install_text.cfg | 5 +++++ 3 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 share/bootloaders/syslinux/install.cfg create mode 100644 share/bootloaders/syslinux/install_gui.cfg create mode 100644 share/bootloaders/syslinux/install_text.cfg (limited to 'share/bootloaders/syslinux') diff --git a/share/bootloaders/syslinux/install.cfg b/share/bootloaders/syslinux/install.cfg deleted file mode 100644 index f56b7f924..000000000 --- a/share/bootloaders/syslinux/install.cfg +++ /dev/null @@ -1,11 +0,0 @@ -label installgui - menu label ^Graphical install - linux /install/gtk/vmlinuz - initrd /install/gtk/initrd.gz - append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet - -label install - menu label ^Install - linux /install/vmlinuz - initrd /install/initrd.gz - append vga=788 @APPEND_INSTALL@ --- quiet diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg new file mode 100644 index 000000000..f56b7f924 --- /dev/null +++ b/share/bootloaders/syslinux/install_gui.cfg @@ -0,0 +1,11 @@ +label installgui + menu label ^Graphical install + linux /install/gtk/vmlinuz + initrd /install/gtk/initrd.gz + append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet + +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet diff --git a/share/bootloaders/syslinux/install_text.cfg b/share/bootloaders/syslinux/install_text.cfg new file mode 100644 index 000000000..83f014753 --- /dev/null +++ b/share/bootloaders/syslinux/install_text.cfg @@ -0,0 +1,5 @@ +label install + menu label ^Install + linux /install/vmlinuz + initrd /install/initrd.gz + append vga=788 @APPEND_INSTALL@ --- quiet -- cgit v1.2.3