commit:     16ff3cd8df6169f73e3d7cf00758a4703f62cbf0
Author:     Christian Brauner <christian.brauner <AT> ubuntu <DOT> com>
AuthorDate: Mon Feb 12 12:32:01 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 21:51:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=16ff3cd8

check whether /sys/fs/cgroup is a mountpoint

The current check only tries to detect whether /sys/fs/cgroup exists and
whether it is writable or not. But when the init system doesn't mount
cgroups then /sys/fs/cgroup will just be an empty directory. When paired
with unprivileged containers that mount sysfs this will cause misleading
errors to be printed since /sys/fs/cgroup will be owned by user
nobody:nogroup in this case. Independent of this specific problem this
check will also be misleading when the /sys/fs/cgroup exists and is in
fact writable by the init system but isn't actually a mountpoint.

Note from William. "grep -qs" doesn't need to redirect output to
/dev/null since it is completely silent.

This fixes #209.

 sh/openrc-run.sh.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index 95d0ecab..e3dff6ce 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -260,9 +260,12 @@ for _cmd; do
                # Apply cgroups settings if defined
                if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
                then
-                       if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
-                               eerror "No permission to apply cgroup settings"
-                               break
+                       if grep -qs /sys/fs/cgroup /proc/1/mountinfo
+                       then
+                               if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup 
]; then
+                                       eerror "No permission to apply cgroup 
settings"
+                                       break
+                               fi
                        fi
                        cgroup_add_service
                fi

Reply via email to