summaryrefslogtreecommitdiff
path: root/scripts/build/binary_syslinux
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-02-25 04:03:05 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-03-05 11:48:04 +0000
commit2f5ae873b0d0cb0a0f94ba03a279db09fdeb5fa6 (patch)
tree6d5b1e87d5fa67a61bf89a29c4cd83a5748dab84 /scripts/build/binary_syslinux
parent3897aac77a808dac94321d677458c45780a3e405 (diff)
downloadvyos-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/binary_syslinux')
-rwxr-xr-xscripts/build/binary_syslinux9
1 files changed, 9 insertions, 0 deletions
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