diff options
| author | William Hubbs <williamh@gentoo.org> | 2011-04-15 19:21:20 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-04-15 19:21:20 -0500 |
| commit | de0ded4ed05f1d52f92b22386fe7d5321ebf7e8e (patch) | |
| tree | bb7d7564deac4c86fd67dcbb0136e085f6e199fe | |
| parent | 75722dac4ed11ea90f4eeda2095ed75293ec3586 (diff) | |
revert changes for bug #292894
This is being done because these dependency changes caused a regression.
We will need to revisit the previously mentioned bug.
X-Gentoo-Bug: 363693
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=363693
| -rw-r--r-- | doc/net.example.BSD.in | 9 | ||||
| -rw-r--r-- | doc/net.example.Linux.in | 9 | ||||
| -rw-r--r-- | init.d/net.lo.in | 6 |
3 files changed, 4 insertions, 20 deletions
diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in index eacfca67..2329fa22 100644 --- a/doc/net.example.BSD.in +++ b/doc/net.example.BSD.in @@ -359,15 +359,6 @@ # manager like resolvconf-gentoo to manage this file for you. All packages # that baselayout supports use resolvconf-gentoo if installed. -# If you run any services on net.lo which need localmount, either the -# services or net.lo should explicitly bring in localmount. -# If you do not do this, openrc will try to bring up net.lo as soon as -# possible, which may be too early for your services. -# If you use network file systems for your core system this may -# interfere. -# Also, you may need this if 127.0.0.1 is in your /etc/resolv.conf. -#rc_net_lo0_need="localmount" - #----------------------------------------------------------------------------- # Cable in/out detection # Sometimes the cable is in, others it's out. Obviously you don't want to diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in index 844a67a9..709e201b 100644 --- a/doc/net.example.Linux.in +++ b/doc/net.example.Linux.in @@ -962,15 +962,6 @@ # manager like resolvconf-gentoo to manage this file for you. All packages # that baselayout supports use resolvconf-gentoo if installed. -# If you run any services on net.lo which need localmount, either the -# services or net.lo should explicitly bring in localmount. -# If you do not do this, openrc will try to bring up net.lo as soon as -# possible, which may be too early for your services. -# If you use network file systems for your core system this may -# interfere. -# Also, you may need this if 127.0.0.1 is in your /etc/resolv.conf. -#rc_net_lo_need="localmount" - #----------------------------------------------------------------------------- # Cable in/out detection # Sometimes the cable is in, others it's out. Obviously you don't want to diff --git a/init.d/net.lo.in b/init.d/net.lo.in index 68c88958..8f4ea9ba 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -18,12 +18,14 @@ depend() local IFACE=${RC_SVCNAME#*.} local IFVAR=$(shell_var "${IFACE}") + need localmount + after bootmisc provide net keyword -jail -prefix -vserver case "${IFACE}" in - lo|lo0) before mtab ; need root ;; - *) after bootmisc net.lo net.lo0 ; need localmount ;; + lo|lo0);; + *) after net.lo net.lo0;; esac if [ "$(command -v "depend_${IFVAR}")" = "depend_${IFVAR}" ]; then |