manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslinux: add memtest menu entry only if including memtest

This commit is contained in:
jnqnfe 2015-01-15 03:39:00 +00:00 committed by Lyndon Brown
parent 7ffd2288d9
commit 31fa6abd36
9 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/binary_syslinux
View File

@ -274,6 +274,14 @@ else
sed -i "s#@OPTIONAL_INSTALLER_INCLUDE@#include install.cfg#g" "${_TARGET}"/menu.cfg sed -i "s#@OPTIONAL_INSTALLER_INCLUDE@#include install.cfg#g" "${_TARGET}"/menu.cfg
fi fi
# Replace placeholder for optional memtest menu entry include
if [ ! -f "binary/${_INITRAMFS}/memtest" ]; then
rm -f "${_TARGET}"/memtest.cfg
sed -i -e "#@OPTIONAL_MEMTEST_INCLUDE@#d" "${_TARGET}"/advanced.cfg
else
sed -i -e "s#@OPTIONAL_MEMTEST_INCLUDE@#include memtest.cfg#g" "${_TARGET}"/advanced.cfg
fi
if [ -e "${_TARGET}/splash.svg" ] if [ -e "${_TARGET}/splash.svg" ]
then then
case "${LB_BUILD_WITH_CHROOT}" in case "${LB_BUILD_WITH_CHROOT}" in

5
share/bootloaders/extlinux/advanced.cfg
View File

@ -3,7 +3,4 @@ label hdt
menu title Hardware Detection Tool (HDT) menu title Hardware Detection Tool (HDT)
com32 hdt.c32 com32 hdt.c32
label memtest @OPTIONAL_MEMTEST_INCLUDE@
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

4
share/bootloaders/extlinux/memtest.cfg Normal file
View File

@ -0,0 +1,4 @@
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

5
share/bootloaders/isolinux/advanced.cfg
View File

@ -3,7 +3,4 @@ label hdt
menu title Hardware Detection Tool (HDT) menu title Hardware Detection Tool (HDT)
com32 hdt.c32 com32 hdt.c32
label memtest @OPTIONAL_MEMTEST_INCLUDE@
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

4
share/bootloaders/isolinux/memtest.cfg Normal file
View File

@ -0,0 +1,4 @@
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

5
share/bootloaders/pxelinux/advanced.cfg
View File

@ -3,7 +3,4 @@ label hdt
menu title Hardware Detection Tool (HDT) menu title Hardware Detection Tool (HDT)
com32 hdt.c32 com32 hdt.c32
label memtest @OPTIONAL_MEMTEST_INCLUDE@
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

4
share/bootloaders/pxelinux/memtest.cfg Normal file
View File

@ -0,0 +1,4 @@
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

5
share/bootloaders/syslinux/advanced.cfg
View File

@ -3,7 +3,4 @@ label hdt
menu title Hardware Detection Tool (HDT) menu title Hardware Detection Tool (HDT)
com32 hdt.c32 com32 hdt.c32
label memtest @OPTIONAL_MEMTEST_INCLUDE@
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

4
share/bootloaders/syslinux/memtest.cfg Normal file
View File

@ -0,0 +1,4 @@
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest