Skip to content

Commit 23f6c9a

Browse files
authored
fix(config): parms setting will work again if present in configs (#3381)
* fix(config): parms setting will work again if present in configs This will allow the legacy "parms" to still function
1 parent 6411097 commit 23f6c9a

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

linuxgsm.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,25 @@ else
465465
elif grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/_default.cfg"; then
466466
eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
467467
fi
468+
469+
# For legacy configs that still use parms= 15.03.21
470+
if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then
471+
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")"
472+
elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/${selfname}.cfg"; then
473+
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/${selfname}.cfg")"
474+
elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-common.cfg"; then
475+
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-common.cfg")"
476+
elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/common.cfg"; then
477+
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/common.cfg")"
478+
elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/_default.cfg"; then
479+
eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/_default.cfg")"
480+
fi
481+
482+
if [ -n "${parms}" ]; then
483+
startparameters="${parms}"
484+
fi
468485
}
486+
469487
fn_reload_startparameters
470488
# Load the linuxgsm.sh in to tmpdir. If missing download it.
471489
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then

0 commit comments

Comments
 (0)