Skip to content

Commit 8f48905

Browse files
committed
openrc-run.sh: fixup permission check.
old check would not hit if cgroups isn't mounted
1 parent eea58c8 commit 8f48905

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

sh/openrc-run.sh.in

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,14 @@ if yesno "${rc_verbose:-$RC_VERBOSE}"; then
290290
fi
291291

292292
_setup_cgroup() {
293-
# Apply cgroups settings if defined
294-
if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then
295-
if grep -qs /sys/fs/cgroup /proc/1/mountinfo && [ -d /sys/fs/cgroup ] && ! [ -w /sys/fs/cgroup ]; then
296-
eerror "No permission to apply cgroup settings"
297-
return
298-
fi
299-
cgroup_add_service
300-
fi
293+
grep -qs /sys/fs/cgroup /proc/1/mountinfo || return
294+
[ -w /sys/fs/cgroup ] || {
295+
yesno "$RC_USER_SERVICES" || eerror "No permission to apply cgroup settings"
296+
return
297+
}
301298

299+
# Apply cgroups settings if defined
300+
[ "$(command -v cgroup_add_service)" = "cgroup_add_service" ] && cgroup_add_service
302301
[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] && cgroup_set_limits
303302
[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] && cgroup2_set_limits
304303
}

0 commit comments

Comments
 (0)