Skip to content

Commit c2f7cd7

Browse files
committed
init.d/cgroups: formatting and minor refactor of cgroup1_controllers
1 parent 225dc1c commit c2f7cd7

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

init.d/cgroups.in

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,22 @@ cgroup1_controllers()
4545
{
4646
yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] &&
4747
grep -qw cgroup /proc/filesystems || return 0
48+
4849
while read -r name _ _ enabled _; do
49-
case "${enabled}" in
50-
1) mountinfo -q "/sys/fs/cgroup/${name}" && continue
51-
local x
52-
for x in $rc_cgroup_controllers; do
53-
[ "${name}" = "blkio" ] && [ "${x}" = "io" ] &&
54-
continue 2
55-
[ "${name}" = "${x}" ] &&
56-
continue 2
57-
done
58-
mkdir "/sys/fs/cgroup/${name}"
59-
mount -n -t cgroup -o "${cgroup_opts},${name}" \
60-
"${name}" "/sys/fs/cgroup/${name}"
61-
yesno "${rc_cgroup_memory_use_hierarchy:-no}" &&
62-
[ "${name}" = memory ] &&
63-
echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
64-
;;
65-
esac
50+
[ "$enabled" = 1 ] || continue;
51+
mountinfo -q "/sys/fs/cgroup/${name}" && continue
52+
53+
local x
54+
for x in $rc_cgroup_controllers; do
55+
[ "${name}" = "blkio" ] && [ "${x}" = "io" ] && continue 2
56+
[ "${name}" = "${x}" ] && continue 2
57+
done
58+
59+
mkdir "/sys/fs/cgroup/${name}"
60+
mount -n -t cgroup -o "${cgroup_opts},${name}" "${name}" "/sys/fs/cgroup/${name}"
61+
if [ yesno "${rc_cgroup_memory_use_hierarchy:-no}" && [ "${name}" = memory ]; then
62+
echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
63+
fi
6664
done < /proc/cgroups
6765
return 0
6866
}
@@ -149,5 +147,6 @@ start()
149147
mount_cgroups
150148
restorecon_cgroups
151149
fi
150+
152151
return 0
153152
}

0 commit comments

Comments
 (0)