From cd5722aca50f0eaddde7ce04ee00da53c313ba7d Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sat, 16 Sep 2017 16:46:42 -0500 Subject: [PATCH] cgroup2_find_path: use legacy mode if cgroup2 is not in the kernel This is related to #164. --- sh/rc-cgroup.sh.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in index 930eeefc..9e93d841 100644 --- a/sh/rc-cgroup.sh.in +++ b/sh/rc-cgroup.sh.in @@ -146,10 +146,12 @@ cgroup_set_limits() cgroup2_find_path() { - case "${rc_cgroup_mode:-hybrid}" in - hybrid) printf "/sys/fs/cgroup/unified" ;; - unified) printf "/sys/fs/cgroup" ;; + if grep -qw cgroup2 /proc/filesystems; then + case "${rc_cgroup_mode:-hybrid}" in + hybrid) printf "/sys/fs/cgroup/unified" ;; + unified) printf "/sys/fs/cgroup" ;; esac + fi return 0 } @@ -180,7 +182,7 @@ cgroup2_set_limits() { local cgroup_path cgroup_path="$(cgroup2_find_path)" - [ -z "${cgroup_path}" ] && return 0 + [ -d "${cgroup_path}" ] || return 0 rc_cgroup_path="${cgroup_path}/${RC_SVCNAME}" local OIFS="$IFS" IFS="