[gentoo-commits] proj/openrc:openrc-0.9.8.x commit in: init.d/

[gentoo-commits] proj/openrc:openrc-0.9.8.x commit in: init.d/

[William Hubbs]

commit:     cc8a9cdab9ff5bb17fc0d49fc130ed7cd9510464
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 17:14:50 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 15:45:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=cc8a9cda

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 <AT> gmail.com>
X-Gentoo-Bug: 400967
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400967

---
 init.d/sysfs.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7021feb..68a71c6 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -82,7 +82,7 @@ mount_cgroups()
 	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

[gentoo-commits] proj/openrc:openrc-0.9.8.x commit in: init.d/

[William Hubbs]

commit:     d8a5d35760a4a1acaf74d1bcbbe76b2b566196d5
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 17:02:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 16:12:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d8a5d357

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 <AT> ijs.si>
X-Gentoo-Bug: 400903
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400903

---
 init.d/sysfs.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 68a71c6..3736d1f 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -74,10 +74,8 @@ 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

[gentoo-commits] proj/openrc:openrc-0.9.8.x commit in: init.d/

[William Hubbs]

commit:     8a41537f688f62000ba3b1a856d42ef3fadc52fc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:06:46 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 18:12:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8a41537f

Revert "Net: do not bring down interfaces during shutdown"

This reverts commit 6d5a2d5f9e5c1e3cb4c24dfc0c2ed2c118d8e64c.
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

---
 init.d/net.lo.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 9fdeaba..bf2d848 100644
--- 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);;