mirror of
https://github.com/openzfs/zfs.git
synced 2025-12-19 05:05:52 +01:00
Change shellcheck and checkbashism triggers.
Some checks failed
CodeQL / Analyze (python) (push) Has been cancelled
checkstyle / checkstyle (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
smatch / smatch (push) Has been cancelled
zfs-qemu / Setup (push) Has been cancelled
zloop / zloop (push) Has been cancelled
zfs-qemu / qemu-x86 (push) Has been cancelled
zfs-qemu / Cleanup (push) Has been cancelled
Some checks failed
CodeQL / Analyze (python) (push) Has been cancelled
checkstyle / checkstyle (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
smatch / smatch (push) Has been cancelled
zfs-qemu / Setup (push) Has been cancelled
zloop / zloop (push) Has been cancelled
zfs-qemu / qemu-x86 (push) Has been cancelled
zfs-qemu / Cleanup (push) Has been cancelled
Newer versions of `shellcheck` and `checkbashism` finds more than previous, so fix those. Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Rob Norris <robn@despairlabs.com> Signed-off-by: Turbo Fredriksson <turbo@bayour.com> Closes #18000
This commit is contained in:
committed by
Brian Behlendorf
parent
6c6a469bea
commit
0ba3403323
@@ -446,7 +446,7 @@ decrypt_fs()
|
||||
echo "${ENCRYPTIONROOT}" > /run/zfs_fs_name
|
||||
|
||||
# If root dataset is encrypted...
|
||||
if ! [ "${ENCRYPTIONROOT}" = "-" ]
|
||||
if [ "${ENCRYPTIONROOT}" != "-" ]
|
||||
then
|
||||
KEYSTATUS="$(get_fs_value "${ENCRYPTIONROOT}" keystatus)"
|
||||
# Continue only if the key needs to be loaded
|
||||
@@ -465,7 +465,7 @@ decrypt_fs()
|
||||
done
|
||||
|
||||
# Do not prompt if key is stored noninteractively,
|
||||
if ! [ "${KEYLOCATION}" = "prompt" ]
|
||||
if [ "${KEYLOCATION}" != "prompt" ]
|
||||
then
|
||||
"${ZFS}" load-key "${ENCRYPTIONROOT}"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ RET=0
|
||||
# check for exec stacks
|
||||
OUT=$(scanelf -qyRAF '%e %p' "$1")
|
||||
|
||||
if [ x"${OUT}" != x ]; then
|
||||
if [ "${OUT}" != "" ]; then
|
||||
RET=2
|
||||
echo "The following files contain writable and executable sections"
|
||||
echo " Files with such sections will not work properly (or at all!) on some"
|
||||
@@ -26,7 +26,7 @@ fi
|
||||
# check for TEXTRELS
|
||||
OUT=$(scanelf -qyRAF '%T %p' "$1")
|
||||
|
||||
if [ x"${OUT}" != x ]; then
|
||||
if [ "${OUT}" != "" ]; then
|
||||
RET=2
|
||||
echo "The following files contain runtime text relocations"
|
||||
echo " Text relocations force the dynamic linker to perform extra"
|
||||
|
||||
Reference in New Issue
Block a user