I flubbed up the merge on the new fixes, releasing a 0.9.8.4 with the actual fixes.

Merge branch 'openrc-0.9.8.x' of git+ssh://git.overlays.gentoo.org/proj/openrc into openrc-0.9.8.x
Revert "Net: do not bring down interfaces during shutdown"
2012-01-30 20:20:24 +00:00 · 2012-01-30 20:12:32 +00:00 · 2012-01-30 12:12:58 -06:00 · 2012-01-30 10:12:08 -06:00 · 2012-01-30 09:45:49 -06:00
3 changed files with 5 additions and 7 deletions
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.9.8.3
+VERSION=	0.9.8.4
 PKG=		${NAME}-${VERSION}
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -21,7 +21,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -shutdown -jail -prefix -vserver
+	keyword -jail -prefix -vserver

 	case "${IFACE}" in
 		lo|lo0);;
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -74,15 +74,13 @@ mount_misc()

 mount_cgroups()
 {
-	yesno ${rc_cgroups:-YES} || return 0
-	if [ ! -e /proc/cgroups ]; then
-		return 0
-	fi
+	yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
+		mountinfo -q /sys/fs/cgroup || return 0

 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}
-				mount -t cgroup -o nodev,noexec,nosuid,${name} \
+				mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
 					${name} /sys/fs/cgroup/${name}
 				;;
 		esac
Author	SHA1	Message	Date
Robin H. Johnson	14b7f0e7fa	I flubbed up the merge on the new fixes, releasing a 0.9.8.4 with the actual fixes.	2012-01-30 20:20:24 +00:00
Robin H. Johnson	e45cd15930	Merge branch 'openrc-0.9.8.x' of git+ssh://git.overlays.gentoo.org/proj/openrc into openrc-0.9.8.x	2012-01-30 20:12:32 +00:00
William Hubbs	8a41537f68	Revert "Net: do not bring down interfaces during shutdown" This reverts commit `6d5a2d5f9e`. There are interfaces, such as adsl and ppp interfaces which need to be brought down. Also, the WOL setting is a good case for bringingdown interfaces. Reported-by: Miguel Sanjurjo <Miguel.Sanjurjo @gmail.com> X-Gentoo-Bug: 401269 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=401269	2012-01-30 12:12:58 -06:00
William Hubbs	d8a5d35760	cgroups: make sure /sys/fs/cgroup is a mount point We need to make sure this directory is a mount point before we add the control groups. Reported-by: Andrej Filipcic <andrej.filipcic@ijs.si> X-Gentoo-Bug: 400903 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400903	2012-01-30 10:12:08 -06:00
William Hubbs	cc8a9cdab9	Cgroups: do not update mtab when mounting control groups This is based on a patch submitted by the reporter; however, there was another mount command which needed -n as well so it was added to the patch. Reported-by: Ben Kohler <bkohler@gmail.com> X-Gentoo-Bug: 400967 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400967	2012-01-30 09:45:49 -06:00