From: Harald Hoyer Date: Fri, 26 Mar 2021 09:29:33 +0000 (+0100) Subject: fix(selinux): shellcheck for modules.d/98selinux X-Git-Tag: 054~219 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cdf927d3baf4eddea8c97f715c3016972549ebd8;p=thirdparty%2Fdracut.git fix(selinux): shellcheck for modules.d/98selinux --- diff --git a/modules.d/98selinux/.shchkdir b/modules.d/98selinux/.shchkdir new file mode 100644 index 000000000..e69de29bb diff --git a/modules.d/98selinux/selinux-loadpolicy.sh b/modules.d/98selinux/selinux-loadpolicy.sh index 06640200f..0235b8ed4 100755 --- a/modules.d/98selinux/selinux-loadpolicy.sh +++ b/modules.d/98selinux/selinux-loadpolicy.sh @@ -7,12 +7,13 @@ rd_load_policy() { getarg "selinux=0" > /dev/null && return 0 SELINUX="enforcing" + # shellcheck disable=SC1090 [ -e "$NEWROOT/etc/selinux/config" ] && . "$NEWROOT/etc/selinux/config" # Check whether SELinux is in permissive mode permissive=0 - getarg "enforcing=0" > /dev/null - if [ $? -eq 0 -o "$SELINUX" = "permissive" ]; then + + if getarg "enforcing=0" > /dev/null || [ "$SELINUX" = "permissive" ]; then permissive=1 fi @@ -21,20 +22,20 @@ rd_load_policy() { local ret=0 local out info "Loading SELinux policy" - mount -o bind /sys $NEWROOT/sys + mount -o bind /sys "$NEWROOT"/sys # load_policy does mount /proc and /sys/fs/selinux in # libselinux,selinux_init_load_policy() if [ -x "$NEWROOT/sbin/load_policy" ]; then out=$(LANG=C chroot "$NEWROOT" /sbin/load_policy -i 2>&1) ret=$? - info $out + info "$out" else out=$(LANG=C chroot "$NEWROOT" /usr/sbin/load_policy -i 2>&1) ret=$? - info $out + info "$out" fi - umount $NEWROOT/sys/fs/selinux - umount $NEWROOT/sys + umount "$NEWROOT"/sys/fs/selinux + umount "$NEWROOT"/sys if [ "$SELINUX" = "disabled" ]; then return 0