Skip to content

openrc-run: fixup wrong 'break' in cgroup setup #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
navi-desu merged 2 commits into from
Apr 14, 2026
+16 −17
Merged

openrc-run: fixup wrong 'break' in cgroup setup #1003

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eea58c8
openrc-run.sh: extract _setup_cgroup function and replace break with …
navi-desu Apr 14, 2026
8f48905
openrc-run.sh: fixup permission check.
navi-desu Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions sh/openrc-run.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,27 +289,26 @@ if yesno "${rc_verbose:-$RC_VERBOSE}"; then
export EINFO_VERBOSE
fi

case $1 in
status|describe) ;;
*)
# Apply any ulimit(s) defined
[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && apply_ulimits ${rc_ulimit:-$RC_ULIMIT}
_setup_cgroup() {
grep -qs /sys/fs/cgroup /proc/1/mountinfo || return
[ -w /sys/fs/cgroup ] || {
yesno "$RC_USER_SERVICES" || eerror "No permission to apply cgroup settings"
return
}

# Apply cgroups settings if defined
if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then
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

[ "$(command -v cgroup_add_service)" = "cgroup_add_service" ] && cgroup_add_service
[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] && cgroup_set_limits
[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] && cgroup2_set_limits
;;
}

case $1 in
status|describe) ;;
*)
# Apply any ulimit(s) defined
[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && apply_ulimits ${rc_ulimit:-$RC_ULIMIT}
_setup_cgroup
;;
esac

eval "printf '%s\n' $required_dirs" | while read _d; do
Expand Down
Loading