[gentoo-commits] proj/openrc:openrc-0.11.x commit in: doc/

[gentoo-commits] proj/openrc:openrc-0.11.x commit in: doc/

[William Hubbs]

commit:     0396f0ea7c7119847ef7fc8440c1e1543bdf09e2
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Oct 28 19:29:33 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 20:02:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0396f0ea

Oldnet: make carrier timeout documentation consistent

---
 doc/net.example.BSD.in   |   11 +++--------
 doc/net.example.Linux.in |   12 +++++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in
index 6cd2caf..fb25215 100644
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -80,9 +80,9 @@
 # Most drivers that report carrier status function correctly, but some do not
 # One of these faulty drivers is for the Intel e1000 network card, but only
 # at boot time. To get around this you may alter the carrier_timeout value for
-# the interface. -1 is disable, 0 is infinite and any other number of seconds
-# is how long we wait for carrier. The current default is 3 seconds
-#carrier_timeout_eth0=-1
+# the interface. 0 is disable and any other number of seconds is how
+# long we wait for carrier. The current default is disabled.
+#carrier_timeout_eth0=0
 
 # You may wish to disable the interface being brought down when stopping.
 # This is only of use for WakeOnLan.
@@ -368,11 +368,6 @@
 #rc-update add devd boot
 #rc
 
-# Set carrier detection timeout.
-# This allows the interface to only start if there is a carrier. The
-# default setting is 0 which means to ignore this.
-# carrier_timeout_eth0=0
-
 ##############################################################################
 # ADVANCED CONFIGURATION
 #

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index eb09a48..70ae4e9 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -126,6 +126,13 @@
 # tables you may have to set a global metric as the due to a simple read of
 # the routing table taking over a minute at a time.
 
+# Most drivers that report carrier status function correctly, but some do not
+# One of these faulty drivers is for the Intel e1000 network card, but only
+# at boot time. To get around this you may alter the carrier_timeout value for
+# the interface. 0 is disable and any other number of seconds is how
+# long we wait for carrier. The current default is disabled.
+#carrier_timeout_eth0=0
+
 # You may wish to disable the interface being brought down when stopping.
 # This is only of use for WakeOnLan.
 #ifdown_eth0="NO"
@@ -1130,11 +1137,6 @@
 # Hypothetical network card that requires a change-eeprom toggle to enable flashing
 #ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
 
-# Set carrier detection timeout.
-# This allows the interface to only start if there is a carrier. The
-# default setting is 0 which means to ignore this.
-# carrier_timeout_eth0=0
-
 ##############################################################################
 # ADVANCED CONFIGURATION
 #

[gentoo-commits] proj/openrc:openrc-0.11.x commit in: doc/

[William Hubbs]

commit:     a75a9940b0786ae8c531a22bd6477799d0b0549a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 22 14:35:14 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 20:02:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a75a9940

oldnet: document the carrier_timeout option

---
 doc/net.example.BSD.in   |    5 +++++
 doc/net.example.Linux.in |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in
index 585f73d..6cd2caf 100644
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -368,6 +368,11 @@
 #rc-update add devd boot
 #rc
 
+# Set carrier detection timeout.
+# This allows the interface to only start if there is a carrier. The
+# default setting is 0 which means to ignore this.
+# carrier_timeout_eth0=0
+
 ##############################################################################
 # ADVANCED CONFIGURATION
 #

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 8ef476d..eb09a48 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -1130,6 +1130,11 @@
 # Hypothetical network card that requires a change-eeprom toggle to enable flashing
 #ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
 
+# Set carrier detection timeout.
+# This allows the interface to only start if there is a carrier. The
+# default setting is 0 which means to ignore this.
+# carrier_timeout_eth0=0
+
 ##############################################################################
 # ADVANCED CONFIGURATION
 #