Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:openrc-0.11.x commit in: init.d/, conf.d/
Date: Sun, 28 Oct 2012 21:44:06
Message-Id: 1351454561.18dc0efa521ab690ef7972083942217c6085787c.WilliamH@OpenRC
1 commit: 18dc0efa521ab690ef7972083942217c6085787c
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Thu Oct 25 21:33:43 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 28 20:02:41 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=18dc0efa
7
8 netmount: drop need net from dependencies
9
10 Reported-by: <mattsch <AT> gmail.com>
11 X-Gentoo-Bug: 439658
12 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439658
13
14 ---
15 conf.d/Makefile | 3 ++-
16 conf.d/netmount | 20 ++++++++++++++++++++
17 init.d/netmount.in | 1 -
18 3 files changed, 22 insertions(+), 2 deletions(-)
19
20 diff --git a/conf.d/Makefile b/conf.d/Makefile
21 index 0e61021..1f28967 100644
22 --- a/conf.d/Makefile
23 +++ b/conf.d/Makefile
24 @@ -1,5 +1,6 @@
25 DIR= ${CONFDIR}
26 -CONF= bootmisc fsck hostname localmount urandom tmpfilesd ${CONF-${OS}}
27 +CONF= bootmisc fsck hostname localmount netmount urandom tmpfilesd \
28 + ${CONF-${OS}}
29
30 ifeq (${MKNET},)
31 CONF+= network staticroute
32
33 diff --git a/conf.d/netmount b/conf.d/netmount
34 new file mode 100644
35 index 0000000..7df2c8d
36 --- /dev/null
37 +++ b/conf.d/netmount
38 @@ -0,0 +1,20 @@
39 +# Depending on how mounting your network file systems behaves when your
40 +# network interfaces are down, you may need to set the netmount script to
41 +# require specific network interfaces to be active. This file gives
42 +# examples of how to do this:
43 +#
44 +# If you are using newnet and configuring the interface with a static
45 +# address with the network script:
46 +# rc_need="network"
47 +#
48 +# If you are using oldnet, you must list the specific net.* services you
49 +# need:
50 +#
51 +# rc_need="net.eth0"
52 +# rc_need="net.eth1 net.eth2"
53 +#
54 +# If you are using a dynamic network management tool like
55 +# networkmanager, dhcpcd, etc, you should list that tool here.
56 +#
57 +# rc_need="networkmanager"
58 +# rc_need="dhcpcd"
59
60 diff --git a/init.d/netmount.in b/init.d/netmount.in
61 index 57ef6d7..fd577d5 100644
62 --- a/init.d/netmount.in
63 +++ b/init.d/netmount.in
64 @@ -10,7 +10,6 @@ description="Mounts network shares, other than NFS, according to /etc/fstab."
65 depend()
66 {
67 config /etc/fstab
68 - need net
69 use afc-client amd autofs openvpn
70 use dns
71 keyword -jail -prefix -vserver