From 63e0e556840772280c1ec9fac356bda7b780a268 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Mar 2021 19:35:11 +0000 Subject: [PATCH] fix(config): parms setting will work again if present in configs This will allow the legacy "parms" to still function --- linuxgsm.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/linuxgsm.sh b/linuxgsm.sh index 0182d24db..26351783d 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -465,6 +465,24 @@ else elif grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/_default.cfg"; then eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi + + # For legacy configs that still use parms= 15.03.21 + if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/${selfname}.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-common.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-common.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/common.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/common.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/_default.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/_default.cfg")" + fi + + if [ -n "${parms}" ]; then + startparameters="${parms}" + fi + } fn_reload_startparameters # Load the linuxgsm.sh in to tmpdir. If missing download it.