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

syslinux: use more dynamic memtest menu config file 

Fixes the following
 - Correct version (memtest86/memtest86+) shown instead of fixed 'memtest86+' text
 - Ensure correct directory path always used by using replaceable placeholder

Gbp-Dch: Short
This commit is contained in:
jnqnfe 2015-01-19 02:36:13 +00:00 committed by Lyndon Brown
parent 31fa6abd36
commit 38af959aa5
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build/binary_syslinux
View File

@ -266,6 +266,9 @@ do
fi
done
MEMTEST_PATH="${_INITRAMFS}/memtest"
sed -i -e "s#@MEMTEST_VERSION@#${LB_MEMTEST}#g" -e "s#@MEMTEST@#/${MEMTEST_PATH}#g" "${_TARGET}"/memtest.cfg
# Replace placeholder for optional install menu entries include
if [ "${LB_DEBIAN_INSTALLER}" = "none" ]; then
rm -f "${_TARGET}"/install.cfg
@ -275,7 +278,7 @@ else
fi
# Replace placeholder for optional memtest menu entry include
if [ ! -f "binary/${_INITRAMFS}/memtest" ]; then
if [ ! -f "binary/${MEMTEST_PATH}" ]; then
rm -f "${_TARGET}"/memtest.cfg
sed -i -e "#@OPTIONAL_MEMTEST_INCLUDE@#d" "${_TARGET}"/advanced.cfg
else

6
share/bootloaders/extlinux/memtest.cfg
View File

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

6
share/bootloaders/isolinux/memtest.cfg
View File

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

6
share/bootloaders/pxelinux/memtest.cfg
View File

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

6
share/bootloaders/syslinux/memtest.cfg
View File

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