summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2012-10-25 16:33:43 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2012-10-28 15:02:41 -0500
commit18dc0efa521ab690ef7972083942217c6085787c (patch)
tree8c4e2b252c367b87ceb292923c904d15c0956f57
parentf53645b7c728492a8d3e6bb7f2fe8bcbce92cf7d (diff)
downloadopenrc-18dc0efa521ab690ef7972083942217c6085787c.tar.gz
openrc-18dc0efa521ab690ef7972083942217c6085787c.tar.bz2
openrc-18dc0efa521ab690ef7972083942217c6085787c.tar.xz
netmount: drop need net from dependencies
Reported-by: <mattsch@gmail.com> X-Gentoo-Bug: 439658 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439658
-rw-r--r--conf.d/Makefile3
-rw-r--r--conf.d/netmount20
-rw-r--r--init.d/netmount.in1
3 files changed, 22 insertions, 2 deletions
diff --git a/conf.d/Makefile b/conf.d/Makefile
index 0e61021..1f28967 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,5 +1,6 @@
DIR= ${CONFDIR}
-CONF= bootmisc fsck hostname localmount urandom tmpfilesd ${CONF-${OS}}
+CONF= bootmisc fsck hostname localmount netmount urandom tmpfilesd \
+ ${CONF-${OS}}
ifeq (${MKNET},)
CONF+= network staticroute
diff --git a/conf.d/netmount b/conf.d/netmount
new file mode 100644
index 0000000..7df2c8d
--- /dev/null
+++ b/conf.d/netmount
@@ -0,0 +1,20 @@
+# Depending on how mounting your network file systems behaves when your
+# network interfaces are down, you may need to set the netmount script to
+# require specific network interfaces to be active. This file gives
+# examples of how to do this:
+#
+# If you are using newnet and configuring the interface with a static
+# address with the network script:
+# rc_need="network"
+#
+# If you are using oldnet, you must list the specific net.* services you
+# need:
+#
+# rc_need="net.eth0"
+# rc_need="net.eth1 net.eth2"
+#
+# If you are using a dynamic network management tool like
+# networkmanager, dhcpcd, etc, you should list that tool here.
+#
+# rc_need="networkmanager"
+# rc_need="dhcpcd"
diff --git a/init.d/netmount.in b/init.d/netmount.in
index 57ef6d7..fd577d5 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -10,7 +10,6 @@ description="Mounts network shares, other than NFS, according to /etc/fstab."
depend()
{
config /etc/fstab
- need net
use afc-client amd autofs openvpn
use dns
keyword -jail -prefix -vserver