diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-19 02:36:13 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 23:08:26 +0000 |
| commit | 38af959aa5a93387085e1fb15fba69c801239aa1 (patch) | |
| tree | 745faf130400ffac1c56234f0ed30c7d2c16bf9e /scripts/build/binary_syslinux | |
| parent | 31fa6abd3698453a759e56164fb09a53f6870ad1 (diff) | |
| download | vyos-live-build-38af959aa5a93387085e1fb15fba69c801239aa1.tar.gz vyos-live-build-38af959aa5a93387085e1fb15fba69c801239aa1.zip | |
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
Diffstat (limited to 'scripts/build/binary_syslinux')
| -rwxr-xr-x | scripts/build/binary_syslinux | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 443d0133e..409ca2acc 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -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 |