From abc9879c9d1392cedb1dbca3ba9718fd36dad87d Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 26 Mar 2021 10:29:18 +0100 Subject: [PATCH] fix(cio_ignore): shellcheck for modules.d/81cio_ignore --- modules.d/81cio_ignore/.shchkdir | 0 modules.d/81cio_ignore/module-setup.sh | 5 +++-- modules.d/81cio_ignore/parse-cio_accept.sh | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 modules.d/81cio_ignore/.shchkdir diff --git a/modules.d/81cio_ignore/.shchkdir b/modules.d/81cio_ignore/.shchkdir new file mode 100644 index 00000000..e69de29b diff --git a/modules.d/81cio_ignore/module-setup.sh b/modules.d/81cio_ignore/module-setup.sh index 3704ffd8..a54fcb9b 100755 --- a/modules.d/81cio_ignore/module-setup.sh +++ b/modules.d/81cio_ignore/module-setup.sh @@ -14,7 +14,7 @@ cmdline() { local cio_accept if [ -e /boot/zipl/active_devices.txt ]; then - while read dev etc; do + while read -r dev _; do [ "$dev" = "#" -o "$dev" = "" ] && continue if [ -z "$cio_accept" ]; then cio_accept="$dev" @@ -31,7 +31,8 @@ cmdline() { # called by dracut install() { if [[ $hostonly_cmdline == "yes" ]]; then - local _cio_accept=$(cmdline) + local _cio_accept + _cio_accept=$(cmdline) [[ $_cio_accept ]] && printf "%s\n" "$_cio_accept" >> "${initdir}/etc/cmdline.d/01cio_accept.conf" fi diff --git a/modules.d/81cio_ignore/parse-cio_accept.sh b/modules.d/81cio_ignore/parse-cio_accept.sh index 80dc6235..d449be52 100755 --- a/modules.d/81cio_ignore/parse-cio_accept.sh +++ b/modules.d/81cio_ignore/parse-cio_accept.sh @@ -5,17 +5,18 @@ CIO_IGNORE=$(getarg cio_ignore) CIO_ACCEPT=$(getarg rd.cio_accept) -if [ -z $CIO_IGNORE ]; then +if [ -z "$CIO_IGNORE" ]; then info "cio_ignored disabled on commandline" return fi if [ -n "$CIO_ACCEPT" ]; then OLDIFS="$IFS" IFS=, + # shellcheck disable=SC2086 set -- $CIO_ACCEPT while (($# > 0)); do info "Enabling device $1" - cio_ignore --remove $1 + cio_ignore --remove "$1" shift done IFS="$OLDIFS"