Attachment #296139 for bug #395079

View | Details | Raw Unified | Return to bug 395079
Collapse All | Expand All

Lines 22-24 rc_sys="@RC_SYS_DEFAULT@" Link Here

(-)a/etc/rc.conf.Linux (+3 lines)
22	# consolefont, numlock, etc ...)	22	# consolefont, numlock, etc ...)
23	rc_tty_number=12	23	rc_tty_number=12
24		24
		25	# Openrc will create a cgroup hierarchy called openrc which will have all
		26	# services it starts and all subsystems attached to it. Default NO.
		27	#rc_cgroups="YES"

Lines 70-76 mount_misc() Link Here

(-)a/init.d/sysfs.in (-1 / +1 lines)
70	cgroup /sys/fs/cgroup	70	cgroup /sys/fs/cgroup
71	eend $?	71	eend $?
72	fi	72	fi
73	if ! mountinfo -q /sys/fs/cgroup/openrc; then	73	if yesno ${rc_cgroups:-NO} && ! mountinfo -q /sys/fs/cgroup/openrc; then
74	ebegin "creating openrc control group"	74	ebegin "creating openrc control group"
75	mkdir /sys/fs/cgroup/openrc	75	mkdir /sys/fs/cgroup/openrc
76	mount -n -t cgroup -o nodev,noexec,nosuid \	76	mount -n -t cgroup -o nodev,noexec,nosuid \




		mark_service_inactive
	fi
	if [ "$RC_UNAME" = Linux ]; then
		if yesno "${rc_cgroups:-NO}"; then
			local cgroup=/sys/fs/cgroup/openrc
			local svc_cgroup=${cgroup}/${RC_SVCNAME}
			if mountinfo -q ${cgroup}; then
				mkdir ${svc_cgroup}
				for f in cpuset.cpus cpuset.mems; do
						if [ -f ${cgroup}/${f} ]; then
								cp ${cgroup}/${f} ${svc_cgroup}
							fi
						done
				echo $$ > ${svc_cgroup}/tasks
			fi
		fi
	fi
	eval start-stop-daemon --start \
- 

Return to bug 395079

Lines 132-147 start() Link Here

(-)a/sh/runscript.sh.in (-11 / +12 lines)
132	mark_service_inactive	132	mark_service_inactive
133	fi	133	fi
134	if [ "$RC_UNAME" = Linux ]; then	134	if [ "$RC_UNAME" = Linux ]; then
135	local cgroup=/sys/fs/cgroup/openrc	135	if yesno "${rc_cgroups:-NO}"; then
136	local svc_cgroup=${cgroup}/${RC_SVCNAME}	136	local cgroup=/sys/fs/cgroup/openrc
137	if mountinfo -q ${cgroup}; then	137	local svc_cgroup=${cgroup}/${RC_SVCNAME}
138	mkdir ${svc_cgroup}	138	if mountinfo -q ${cgroup}; then
139	for f in cpuset.cpus cpuset.mems; do	139	mkdir ${svc_cgroup}
140	if [ -f ${cgroup}/${f} ]; then	140	for f in cpuset.cpus cpuset.mems; do
141	cp ${cgroup}/${f} ${svc_cgroup}	141	if [ -f ${cgroup}/${f} ]; then
142	fi	142	cp ${cgroup}/${f} ${svc_cgroup}
143	done	143	fi
144	echo $$ > ${svc_cgroup}/tasks	144	done
		145	echo $$ > ${svc_cgroup}/tasks
		146	fi
145	fi	147	fi
146	fi	148	fi
147	eval start-stop-daemon --start \	149	eval start-stop-daemon --start \
148	-