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

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

[William Hubbs]

commit:     463d4ef00a0a2e9423d375f8224ad140eb2b19a8
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 01:53:46 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 02:50:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=463d4ef0

devfs: Remove references to specific device managers

There were references in the devfs script to mdev, udev and
udev-mount. These all provide the virtuals dev and dev-mount; that is
how we should refer to them.

I believe in the discussion I had with Tony and Robin about this, we
were going to change the "use" line to "need". However, after thinking
that over, I'm not comfortable doing so because someone could be running
a static /dev with no device manager.

Reported-by: <tokiclover <AT> gmail.com>
X-Gentoo-Bug: 438932
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438932

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

diff --git a/init.d/devfs.in b/init.d/devfs.in
index 8d5bb48..9e31377 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -5,8 +5,8 @@
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev-mount udev-mount
-	before udev mdev
+	use dev-mount
+	before dev
 	keyword -prefix -vserver
 }
 

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

[William Hubbs]

commit:     ded282f16329efa78a38c8e64303d1f03426907c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Nov 30 18:05:26 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 18:07:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ded282f1

typo fixes

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

diff --git a/init.d/localmount.in b/init.d/localmount.in
index ab0b1b5..232adf4 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -22,8 +22,8 @@ start()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
-		if [ mountinfo -q /usr ]; then
-			touch $rc_svcdir/usr_premounted
+		if mountinfo -q /usr; then
+			touch $RC_SVCDIR/usr_premounted
 		fi
 	fi
 	ebegin "Mounting local filesystems"

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

[William Hubbs]

commit:     611ed4204412f9de47a89d7d64f65b8d45def3cf
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 29 16:19:20 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 23:42:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=611ed420

localmount: only skip unmounting /usr if it was premounted

Add a test when localmount is started to determine if /usr is mounted
from inside an initramfs for Linux systems. If it is not, we can unmount it when
localmount stops.

On *bsd systems, we always unmount /usr if it is separate.

Reported-by: ryao <AT> gentoo.org

---
 init.d/localmount.in |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 8e67c38..ab0b1b5 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -22,6 +22,9 @@ start()
 
 	if [ "$RC_UNAME" = Linux ]; then
 		no_netdev="-O no_netdev"
+		if [ mountinfo -q /usr ]; then
+			touch $rc_svcdir/usr_premounted
+		fi
 	fi
 	ebegin "Mounting local filesystems"
 	mount -at "$types" $no_netdev
@@ -48,7 +51,10 @@ stop()
 	done
 
 	if [ "$RC_UNAME" = Linux ]; then
-		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr"
+		no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*"
+		if [ -e $rc_svcdir/usr_premounted ]; then
+			no_umounts_r="$no_umounts_r|/usr"
+		fi
 	fi
 	no_umounts_r="^($no_umounts_r)$"
 

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

[William Hubbs]

commit:     e27f0acc6039e828d1142e7743d5b463aa05f403
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 22 14:23:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 22 21:30:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e27f0acc

oldnet: make the default carrier timeout 0

Some types of interfaces do not have a carrier, so it doesn't make sense
to automatically wait for one.

Reported-by: <rose <AT> rz.uni-potsdam.de>
X-Gentoo-Bug: 438970
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438970

---
 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 47bdc2f..d42b5ae 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -108,7 +108,7 @@ _wait_for_carrier()
 	_has_carrier  && return 0
 
 	eval timeout=\$carrier_timeout_${IFVAR}
-	timeout=${timeout:-${carrier_timeout:-5}}
+	timeout=${timeout:-${carrier_timeout:-0}}
 
 	# Incase users don't want this nice feature ...
 	[ ${timeout} -le 0 ] && return 0

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

[William Hubbs]

commit:     84820085594d6699a3c5ee08b4997fec8f323f10
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 02:45:14 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 02:52:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=84820085

tmfiles: change need dev to use dev.

This is being changed to use for the reason I stated in the previous
commit. There is no guarantee that someone is using a device manager.

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

diff --git a/init.d/tmpfilesd.sysinit.in b/init.d/tmpfilesd.sysinit.in
index c4c2a2f..303a1cf 100644
--- a/init.d/tmpfilesd.sysinit.in
+++ b/init.d/tmpfilesd.sysinit.in
@@ -8,7 +8,7 @@ depend()
 {
 	# Convert to 'need dev' when the new udev is ready, for OpenRC 0.11
 	#need dev-mount
-	need dev
+	use dev
 }
 
 start()