1 |
commit: ff2e1d42a2d553b831ea914b16d0e32a99dafec4 |
2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 28 19:29:33 2012 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 28 19:29:33 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ff2e1d42 |
7 |
|
8 |
Oldnet: make carrier timeout documentation consistent |
9 |
|
10 |
--- |
11 |
doc/net.example.BSD.in | 11 +++-------- |
12 |
doc/net.example.Linux.in | 12 +++++++----- |
13 |
2 files changed, 10 insertions(+), 13 deletions(-) |
14 |
|
15 |
diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in |
16 |
index 6cd2caf..fb25215 100644 |
17 |
--- a/doc/net.example.BSD.in |
18 |
+++ b/doc/net.example.BSD.in |
19 |
@@ -80,9 +80,9 @@ |
20 |
# Most drivers that report carrier status function correctly, but some do not |
21 |
# One of these faulty drivers is for the Intel e1000 network card, but only |
22 |
# at boot time. To get around this you may alter the carrier_timeout value for |
23 |
-# the interface. -1 is disable, 0 is infinite and any other number of seconds |
24 |
-# is how long we wait for carrier. The current default is 3 seconds |
25 |
-#carrier_timeout_eth0=-1 |
26 |
+# the interface. 0 is disable and any other number of seconds is how |
27 |
+# long we wait for carrier. The current default is disabled. |
28 |
+#carrier_timeout_eth0=0 |
29 |
|
30 |
# You may wish to disable the interface being brought down when stopping. |
31 |
# This is only of use for WakeOnLan. |
32 |
@@ -368,11 +368,6 @@ |
33 |
#rc-update add devd boot |
34 |
#rc |
35 |
|
36 |
-# Set carrier detection timeout. |
37 |
-# This allows the interface to only start if there is a carrier. The |
38 |
-# default setting is 0 which means to ignore this. |
39 |
-# carrier_timeout_eth0=0 |
40 |
- |
41 |
############################################################################## |
42 |
# ADVANCED CONFIGURATION |
43 |
# |
44 |
|
45 |
diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in |
46 |
index eb09a48..70ae4e9 100644 |
47 |
--- a/doc/net.example.Linux.in |
48 |
+++ b/doc/net.example.Linux.in |
49 |
@@ -126,6 +126,13 @@ |
50 |
# tables you may have to set a global metric as the due to a simple read of |
51 |
# the routing table taking over a minute at a time. |
52 |
|
53 |
+# Most drivers that report carrier status function correctly, but some do not |
54 |
+# One of these faulty drivers is for the Intel e1000 network card, but only |
55 |
+# at boot time. To get around this you may alter the carrier_timeout value for |
56 |
+# the interface. 0 is disable and any other number of seconds is how |
57 |
+# long we wait for carrier. The current default is disabled. |
58 |
+#carrier_timeout_eth0=0 |
59 |
+ |
60 |
# You may wish to disable the interface being brought down when stopping. |
61 |
# This is only of use for WakeOnLan. |
62 |
#ifdown_eth0="NO" |
63 |
@@ -1130,11 +1137,6 @@ |
64 |
# Hypothetical network card that requires a change-eeprom toggle to enable flashing |
65 |
#ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple" |
66 |
|
67 |
-# Set carrier detection timeout. |
68 |
-# This allows the interface to only start if there is a carrier. The |
69 |
-# default setting is 0 which means to ignore this. |
70 |
-# carrier_timeout_eth0=0 |
71 |
- |
72 |
############################################################################## |
73 |
# ADVANCED CONFIGURATION |
74 |
# |