diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2018-02-12 13:32:01 +0100 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2018-02-23 15:51:12 -0600 |
| commit | 16ff3cd8df6169f73e3d7cf00758a4703f62cbf0 (patch) | |
| tree | d6a27b69598bbf611c0778d5fabbe318cd5f6e57 | |
| parent | 38032626a6c2f8e869197999f32ac3634667cc86 (diff) | |
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.
| -rw-r--r-- | sh/openrc-run.sh.in | 9 |
1 files 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 |