[gentoo-commits] proj/openrc:master commit in: sh/

[William Hubbs]

commit:     cd5722aca50f0eaddde7ce04ee00da53c313ba7d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 21:46:42 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 21:49:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=cd5722ac

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="