fix(convertfs): error in conditional expressions (bsc#1228847) (SL-Micro-6.0:Update) #356
Conversation
With POSIX conditionals using single brackets, `-n` followed by a variable without quotes is always true. Also, use `$ROOT` instead of hardcoding `/sysroot`.
| @@ -50,7 +50,7 @@ if [ ! -L "$ROOT"/var/lock -a -e "$ROOT"/var/lock ]; then | |||
| ln -sfn ../run/lock "$ROOT"/var/lock | |||
| fi | |||
|
|
|||
| [ -n $SUBVOLIDVAR ] && umount $ROOT/var | |||
| [[ -n $SUBVOLIDVAR ]] && umount $ROOT/var | |||
| [ -w $ROOT ] && mount -o remount,ro $ROOT | |||
There was a problem hiding this comment.
Could you also fix this like in the shellcheck commit in pr 355?
There was a problem hiding this comment.
Do you mean adding also the whole shellcheck commit to all code streams or just this line? I haven't added the whole commit to old code streams on purpose because I think is more "a code improvement" than a bug fix, and it would be submitted via maintenance update, but I can submit it also if you want.
If your concern is the 2 lines with [ -w $ROOT ], the script exits at the beginning if $ROOT is not a directory.
dracut/modules.d/30convertfs/convertfs.sh
Lines 5 to 8 in 20b345b
There was a problem hiding this comment.
Yeah, just wanted to avoid possible errors due to missing double square brackets.
But if it's only cosmetic I'm fine without.
aafeijoo-suse
merged commit a89da38
into
openSUSE:SL-Micro-6.0_Update
With POSIX conditionals using single brackets,
-nfollowed by a variable without quotes is always true.Also, use
$ROOTinstead of hardcoding/sysroot.