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
This commit is contained in:
Lyndon Brown 2020-02-20 08:25:26 +00:00 committed by Raphaël Hertzog
parent fcafaede19
commit 3840ac2005
3 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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
;;