syslinux: add install menu entries only if including installer

2015-01-15 04:41:16 +00:00 · 2015-01-15 04:41:16 +00:00 · 7ffd2288d9
parent 0bf9d2d390
commit 7ffd2288d9
5 changed files with 12 additions and 4 deletions
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@ -266,6 +266,14 @@ do
 	fi
 done

+# Replace placeholder for optional install menu entries include
+if [ "${LB_DEBIAN_INSTALLER}" = "none" ]; then
+	rm -f "${_TARGET}"/install.cfg
+	sed -i "#@OPTIONAL_INSTALLER_INCLUDE@#d" "${_TARGET}"/menu.cfg
+else
+	sed -i "s#@OPTIONAL_INSTALLER_INCLUDE@#include install.cfg#g" "${_TARGET}"/menu.cfg
+fi
+
 if [ -e "${_TARGET}/splash.svg" ]
 then
 	case "${LB_BUILD_WITH_CHROOT}" in
--- a/share/bootloaders/extlinux/menu.cfg
+++ b/share/bootloaders/extlinux/menu.cfg
@ -4,7 +4,7 @@ menu width 82
 menu title Boot menu
 include stdmenu.cfg
 include live.cfg
-include install.cfg
+@OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	menu label ^Advanced options
 	menu title Advanced options
--- a/share/bootloaders/isolinux/menu.cfg
+++ b/share/bootloaders/isolinux/menu.cfg
@ -4,7 +4,7 @@ menu width 82
 menu title Boot menu
 include stdmenu.cfg
 include live.cfg
-include install.cfg
+@OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	menu label ^Advanced options
 	menu title Advanced options
--- a/share/bootloaders/pxelinux/menu.cfg
+++ b/share/bootloaders/pxelinux/menu.cfg
@ -4,7 +4,7 @@ menu width 82
 menu title Boot menu
 include stdmenu.cfg
 include live.cfg
-include install.cfg
+@OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	menu label ^Advanced options
 	menu title Advanced options
--- a/share/bootloaders/syslinux/menu.cfg
+++ b/share/bootloaders/syslinux/menu.cfg
@ -4,7 +4,7 @@ menu width 82
 menu title Boot menu
 include stdmenu.cfg
 include live.cfg
-include install.cfg
+@OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	menu label ^Advanced options
 	menu title Advanced options