cgroups: properly handle cgroups for users

Author: navi-desu

init.d/user.in

@@ -28,4 +28,13 @@ start_pre() {
 		eerror "symbolic links to it for the users you want to start"
 		return 1
 	fi
+
+	if [ -d "$cgroup_path" ]; then
+		local user_cgroup=${cgroup_path}/daemons
+
+		mkdir "$user_cgroup"
+		chown "$user:$user" "$user_cgroup"
+
+		cgroup_path="${cgroup_path}/system"
+	fi
 }

sh/cgroups.sh

@@ -23,6 +23,10 @@ if [ -d "/sys/fs/cgroup/openrc.${RC_SVCNAME}" ]; then
 	cgroup_path="${cgroup_root}/openrc.${RC_SVCNAME}"
 fi
 
+if yesno "$RC_USER_SERVICES" && [ -d "${cgroup_path}/daemons" ]; then
+	cgroup_path="${cgroup_path}/daemons"
+fi
+
 cgroup_running()
 {
 	[ -d "${cgroup_path}" ] ||

sh/openrc-run.sh.in

@@ -57,7 +57,7 @@ sourcex "@LIBEXECDIR@/sh/functions.sh"
 sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
 case $RC_SYS in
 	PREFIX|SYSTEMD-NSPAWN) ;;
-	*) yesno "$RC_USER_SERVICES" || sourcex -e "@LIBEXECDIR@/sh/cgroups.sh";;
+	*) sourcex -e "@LIBEXECDIR@/sh/cgroups.sh";;
 esac
 
 # Support LiveCD foo