summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-02-20 08:25:26 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-03-05 11:39:57 +0000
commit3840ac200507d60be1278d4149882bee88261699 (patch)
tree188a34a00dd464b1975b75c637baf906ce839f77 /functions
parentfcafaede192e150daaf61591aef57edf3c2983fc (diff)
downloadvyos-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
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh3
1 files changed, 3 insertions, 0 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