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: conf.d/
Date: Thu, 29 Nov 2012 23:45:41
Message-Id: 1354232570.38ae8220774d27dd579c8328c33dbe90e9486cec.WilliamH@OpenRC
1 commit: 38ae8220774d27dd579c8328c33dbe90e9486cec
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Thu Nov 29 18:34:34 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 29 23:42:50 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=38ae8220
7
8 netmount: make "net" the default network option for now
9
10 Currently, we have the net virtual, so we should use it as the default
11 in this instance so that netmount comes up after it thinks the network
12 is up. However, this is technically eroneous, because there is no way to
13 know from the init system that we really have network connectivity.
14
15 Reported-by: cheepeero <AT> gmx.net
16 X-Gentoo-Bug: 445116
17 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=445116
18
19 ---
20 conf.d/netmount | 46 +++++++++++++++++++++++++++++++++-------------
21 1 files changed, 33 insertions(+), 13 deletions(-)
22
23 diff --git a/conf.d/netmount b/conf.d/netmount
24 index 7df2c8d..fc19fd4 100644
25 --- a/conf.d/netmount
26 +++ b/conf.d/netmount
27 @@ -1,20 +1,40 @@
28 -# Depending on how mounting your network file systems behaves when your
29 -# network interfaces are down, you may need to set the netmount script to
30 -# require specific network interfaces to be active. This file gives
31 -# examples of how to do this:
32 +# You will need to set the dependencies in the netmount script to match
33 +# the network configuration tools you are using. This should be done in
34 +# this file by following the examples below, and not by changing the
35 +# service script itself.
36 #
37 -# If you are using newnet and configuring the interface with a static
38 -# address with the network script:
39 -# rc_need="network"
40 +# Each of these examples is meant to be used separately. So, for
41 +# example, do not set rc_need to something like "net.eth0 dhcpcd".
42 +#
43 +# If you are using newnet and configuring your interfaces with static
44 +# addresses with the network script, you should use this setting.
45 +#
46 +#rc_need="network"
47 #
48 # If you are using oldnet, you must list the specific net.* services you
49 -# need:
50 +# need.
51 +#
52 +# This example assumes all of your netmounts can be reached on
53 +# eth0.
54 +#
55 +#rc_need="net.eth0"
56 #
57 -# rc_need="net.eth0"
58 -# rc_need="net.eth1 net.eth2"
59 +# This example assumes some of your netmounts are on eth1 and some
60 +# are on eth2.
61 +#
62 +#rc_need="net.eth1 net.eth2"
63 #
64 # If you are using a dynamic network management tool like
65 -# networkmanager, dhcpcd, etc, you should list that tool here.
66 +# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
67 +# manage the network interfaces with the routes to your netmounts, you
68 +# should list that tool.
69 +#
70 +#rc_need="networkmanager"
71 +#rc_need="dhcpcd"
72 +#rc_need="wicd"
73 +#
74 +# The default setting is designed to be backward compatible with our
75 +# current setup, but you are highly discouraged from using this. In
76 +# other words, please change it to be more suited to your system.
77 #
78 -# rc_need="networkmanager"
79 -# rc_need="dhcpcd"
80 +rc_need="net"