diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-20 08:25:26 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-05 11:39:57 +0000 |
| commit | 3840ac200507d60be1278d4149882bee88261699 (patch) | |
| tree | 188a34a00dd464b1975b75c637baf906ce839f77 | |
| parent | fcafaede192e150daaf61591aef57edf3c2983fc (diff) | |
| download | vyos-live-build-3840ac200507d60be1278d4149882bee88261699.tar.gz vyos-live-build-3840ac200507d60be1278d4149882bee88261699.zip | |
memtest: better handle obsolete LB_MEMTEST value
available values currently are memtest86+|memtest86|none; "false" is
presumably handled for backwards compatibility
there is no need to handle this in individual scripts. the right place
to handle it is in Set_Defaults as now done
Gbp-Dch: Short
Closes: #952866
| -rwxr-xr-x | functions/defaults.sh | 3 | ||||
| -rwxr-xr-x | scripts/build/binary_memtest | 2 | ||||
| -rwxr-xr-x | scripts/build/source_debian | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 1c7831532..7d5f4aa57 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -715,6 +715,9 @@ Set_defaults () # Setting memtest option LB_MEMTEST="${LB_MEMTEST:-none}" + if [ "${LB_MEMTEST}" = "false" ]; then + LB_MEMTEST="none" + fi # Setting loadlin option case "${LB_MODE}" in diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 96fb4f101..7c9864e65 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -24,7 +24,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ] +if [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ] then exit 0 fi diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 3960ea2a8..af9fe9f18 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -99,8 +99,7 @@ syslinux grub EOF - if [ "${LB_MEMTEST}" != "false" ] && [ "${LB_MEMTEST}" != "none" ] - then + if [ "${LB_MEMTEST}" != "none" ]; then echo "${LB_MEMTEST}" >> source-selection.txt fi ;; |