From 4dd87d52388d5d472bf630bf13c9a1ab48507d8f Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Fri, 25 Mar 2022 11:36:17 +0530 Subject: [PATCH] scripts/init.d/cgconfig.in: make it shellcheck complaint Make cgconfig.in shellcheck complaint. It fixes all the issues reported by the shellcheck version version 0.7.0. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- scripts/init.d/cgconfig.in | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in index 83cffe9d..527430e0 100644 --- a/scripts/init.d/cgconfig.in +++ b/scripts/init.d/cgconfig.in @@ -38,8 +38,10 @@ lockfile=/run/lock/subsys/$servicename SYSLIBFILE=/lib/lsb/init-functions OLDSYSLIBFILE=/etc/init.d/functions if [[ -x $SYSLIBFILE ]] ; then + # shellcheck disable=SC1090 source $SYSLIBFILE elif [[ -x $OLDSYSLIBFILE ]] ; then + # shellcheck disable=SC1090 source $OLDSYSLIBFILE log_warning_msg() ( warning "$@" ; printf "\n" 1>&2 ; ) log_failure_msg() ( failure "$@" ; printf "\n" 1>&2 ; ) @@ -53,6 +55,7 @@ fi # read the config CREATE_DEFAULT=yes if [ -e /etc/sysconfig/cgconfig ]; then + # shellcheck disable=SC1091 source /etc/sysconfig/cgconfig fi @@ -62,8 +65,9 @@ create_default_groups() { defaultcgroup= if [ -f /etc/cgrules.conf ]; then - read user ctrl defaultcgroup <<< \ - $(grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf) + # shellcheck disable=SC2034 + read -r user ctrl defaultcgroup <<< \ + "$(grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf)" if [[ ( -n "$defaultcgroup" ) && ( "$defaultcgroup" = "*" ) ]]; then log_warning_msg "/etc/cgrules.conf incorrect" log_warning_msg "Overriding it" @@ -86,23 +90,23 @@ create_default_groups() { # Create the default group, ignore errors when the default group # already exists. # - cgcreate -f 664 -d 775 -g $controllers:$defaultcgroup 2>/dev/null + cgcreate -f 664 -d 775 -g "$controllers":"$defaultcgroup" 2>/dev/null # # special rule for cpusets # - if echo $controllers | grep -q -w cpuset; then + if echo "$controllers" | grep -q -w cpuset; then cpus=$(cgget -nv -r cpuset.cpus /) - cgset -r cpuset.cpus=$cpus $defaultcgroup + cgset -r cpuset.cpus="$cpus $defaultcgroup" mems=$(cgget -nv -r cpuset.mems /) - cgset -r cpuset.mems=$mems $defaultcgroup + cgset -r cpuset.mems="$mems $defaultcgroup" fi # # Classify everything to default cgroup. Ignore errors, some processes # may exit after ps is run and before cgclassify moves them. # - cgclassify -g $controllers:$defaultcgroup $(ps --no-headers -eL o tid) \ + cgclassify -g "$controllers:$defaultcgroup $(ps --no-headers -eL o tid)" \ 2>/dev/null || : } -- 2.47.2