[gentoo-commits] proj/openrc:master commit in: doc/

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     1e7c696ea4fb56f36c55bec0af1017a6d4a4fc65
Author:     Walter <walter <AT> pratyeka <DOT> org>
AuthorDate: Sat Oct 13 04:08:29 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 19:14:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1e7c696e

Add documentation for subsuming support

X-Gentoo-Bug: 428604
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=428604

---
 doc/net.example.Linux.in |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 31da4cb..8ef476d 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -646,6 +646,17 @@
 # ppp devices - we need to depend function on the bonded interfaces
 #rc_net_bond0_need="net.eth0 net.eth1"
 
+# Bonding subsume support (prevents crashes for root-on-NFS)
+#  - Only tested in the default bonding mode ('active-backup') with
+# IPv4
+#  - Only subsumes basic interface characteristics (IP, netmask) and
+#    excludes additional routes, interface properties such as MTU,
+#    interface-associated netfilter rules, etc.
+# In the example below, the (usually kernel-autoconfigured)
+# 'eth0' interface is a member of bond0, which subsumes the
+# existing interface configuration without upsetting NFS.
+#slaves_bond0="eth0 eth1"
+#subsume_bond0="eth0"
 
 #-----------------------------------------------------------------------------
 # Classical IP over ATM

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     ff2e1d42a2d553b831ea914b16d0e32a99dafec4
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 19:29:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ff2e1d42

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:master commit in: doc/

[William Hubbs]

commit:     8df18defe14149dd9f48d62c157fa47343c7900b
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: Mon Oct 22 14:35:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8df18def

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
 #

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     92b274a7dea93c4832bcbb0905beb2a93df080e4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 04:16:35 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 04:16:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=92b274a7

net: clarify how to prefer ifconfig over iproute2

reported-by: <vsync <AT> quadium.net>
X-Gentoo-Bug: 417899
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=417899

---
 doc/net.example.Linux.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index ac63715..870c794 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -34,7 +34,7 @@
 # In other words, you probably should DO NOTHING HERE...
 
 # Prefer ifconfig over iproute2
-#modules="ifconfig"
+#modules="!iproute2"
 
 # You can also specify other modules for an interface
 # In this case we prefer udhcpc over dhcpcd
@@ -57,7 +57,7 @@
 
 # If you don't specify an interface then we prefer iproute2 if it's installed
 # To prefer ifconfig over iproute2
-#modules="ifconfig"
+#modules="!iproute2"
 
 # For a static configuration, use something like this
 # (They all do exactly the same thing btw)

[gentoo-commits] proj/openrc:master commit in: doc/

[Robin H. Johnson]

commit:     b264931034bedef6f0a384302334393359dc59c9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:53:09 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:53:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b2649310

doc/net.example: Add warnings that changing MAC on bonds can break things.

In most cases, changing the MAC on a bond manually is wrong. The bonding
module will do it as needed to failover between interfaces, or to get
multiple interfaces to correctly have the same MAC.

We cannot however enforce it, as there are some corner cases where it is
actually valid (hardware that requires specific MAC configuration, like
some quad-port NICs).

Suggested-by: Martin Mokrejs <mmokrejs <AT> fold.natur.cuni.cz>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 doc/net.example.Linux.in |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 51df8a9..ac63715 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -616,6 +616,12 @@
 #slaves_bond0="eth0 eth1 eth2"
 #config_bond0="null" # You may not want to assign an IP the the bond
 
+# Please note, that you should generally NOT try to change the MAC addresses of
+# a bond interface yourself. If you do so, the kernel and your network switches
+# may not work quite right. It is permissible to set the MAC addresses of bond
+# slaves BEFORE the bond comes up, but not after the bond is up (it will change
+# MAC addresses of the slaves on it's own).
+
 # You can also configure the parameters of the bond here, which must be done
 # via sysfs on 2.6 kernels or newer. The description of all the options can be
 # found in the kernel: /usr/src/linux-*/Documentation/networking/bonding.txt
@@ -787,6 +793,8 @@
 
 #-----------------------------------------------------------------------------
 # MAC changer
+# Warning: Do NOT use this on bonding interfaces! Bonding changes MACs itself.
+#
 # To set a specific MAC address
 #mac_eth0="00:11:22:33:44:55"
 

[gentoo-commits] proj/openrc:master commit in: doc/

[Robin H. Johnson]

commit:     76d3fceb58d757a2acd72a89f6098a45b53fc944
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:06:38 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:09:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=76d3fceb

doc/net.example: Update bonding example

The newer bonding code using sysfs does not clearly show the most common
bond parameter: mode

Also include a path to the referenced kernel documentation for the other
settings.

X-Gentoo-Bug: 408333
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=408333

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 doc/net.example.Linux.in |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 1d30545..51df8a9 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -616,9 +616,16 @@
 #slaves_bond0="eth0 eth1 eth2"
 #config_bond0="null" # You may not want to assign an IP the the bond
 
-# You can also configure the bond here, which must be done via sysfs on 2.6
-# kernels or newer. See the kernel bonding documentation for a description of
-# these options.
+# You can also configure the parameters of the bond here, which must be done
+# via sysfs on 2.6 kernels or newer. The description of all the options can be
+# found in the kernel: /usr/src/linux-*/Documentation/networking/bonding.txt
+# You will probably want the 'mode' option at the least.
+# Some possible parameters: mode fail_over_mac arp_validate arp_interval
+# arp_ip_target downdelay updelay lacp_rate ad_select xmit_hash_policy
+# num_grat_arp num_unsol_na miimon primary primary_reselect use_carrier
+# active_slave queue_id all_slaves_active resend_igmp min_links
+#mode_bond0="round-robin"
+#miimon_bond0="100"
 #arp_ip_target_bond0="+26.0.0.0"
 
 # If any of the slaves require extra configuration - for example wireless or

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     44e4c21f056437043d990d21a4db41a8f9799687
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 23:03:28 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 23:03:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=44e4c21f

net: fix documentation for interface dependencies

The network script had a separate case for handling network interface
dependencies using variables of the form
rc_before/after/use/need/provide_ifname. This is unnecessary since
openrc already supports rc_net_ifname_need/use/before/after/provide.
This commit updates the documentation to use this more generally
supported form.

---
 doc/net.example.Linux.in |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 666b44f..1d30545 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -586,10 +586,15 @@
 #vlan_start_eth0="no"
 
 # If you do the above then you may want to depend on eth0 like so
-# rc_need_vlan1="net.eth0"
+# rc_net_vlan1_need="net.eth0"
 # NOTE: depend functions only work in /etc/conf.d/net
 # and not in profile configs such as /etc/conf.d/net.foo
 
+# Also, you might want to make eth0 not provide net in this case so that
+# dependent services will start when the vlan is active instead of the
+# physical interface.
+# rc_net_eth0_provide="!net"
+
 # MAC-VLAN support
 # The following configuration can be used to create a new interface 'macvlan0'
 # linked to 'eth0'
@@ -618,7 +623,7 @@
 
 # If any of the slaves require extra configuration - for example wireless or
 # ppp devices - we need to depend function on the bonded interfaces
-#rc_need_bond0="net.eth0 net.eth1"
+#rc_net_bond0_need="net.eth0 net.eth1"
 
 
 #-----------------------------------------------------------------------------
@@ -735,7 +740,7 @@
 # If the link require extra configuration - for example wireless or
 # RFC 268 bridge - we need to depend on the bridge so they get
 # configured correctly.
-#rc_need_ppp0="net.nas0"
+#rc_net_ppp0_need="net.nas0"
 
 #WARNING: if MTU of the PPP interface is less than 1500 and you use this
 #machine as a router, you should add the following rule to your firewall
@@ -847,7 +852,7 @@
 
 # If any of the ports require extra configuration - for example wireless or
 # ppp devices - we need to depend on them like so.
-#rc_need_br0="net.eth0 net.eth1"
+#rc_net_br0_need="net.eth0 net.eth1"
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
@@ -898,7 +903,7 @@
 # link_6to4="eth0"		# Interface to base its addresses on
 # config_6to4="ip6to4"
 # You may want to depend on eth0 like so
-#rc_need_6to4="net.eth0"
+#rc_net_6to4_need="net.eth0"
 # To ensure that eth0 is configured before 6to4. Of course, the tunnel could be
 # any name and this also works for any configured interface.
 # NOTE: If you're not using iproute2 then your 6to4 tunnel has to be called

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     1875db4ff6cdbed45f4375a2cc04f2fe55f25a32
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 17:17:58 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 17:17:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1875db4f

net: document up_before_preup for BSD

---
 doc/net.example.BSD.in |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in
index 2329fa2..585f73d 100644
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -388,6 +388,17 @@
 #
 # ${IFACE} is set to the interface being brought up/down
 # ${IFVAR} is ${IFACE} converted to variable name bash allows
+#
+# For historical and compatibility reasons, preup is actually normally called
+# in the following sequence: up ; preup ; up.
+# The first up causes the kernel to initialize the device, so
+# that it is available for use in the preup function.  However, for some
+# hardware, e.g. CAN devices, some configuration is needed before trying to up
+# the interface will actually work. For such hardware, the
+# up_before_preup variables will allow skipping the first up call if set
+# to yes.
+#up_before_preup_IFVAR="NO"
+#up_before_preup="NO"
 
 #preup() {
 #	# Remember to return 0 on success

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     26ceddae5e48bac07c82d754bd005df01492fa4f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 16:41:07 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 16:41:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=26ceddae

net: clean up documentation for up_before_preup

---
 doc/net.example.Linux.in |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index d48983e..fd14134 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -1103,15 +1103,16 @@
 # ${IFACE} is set to the interface being brought up/down
 # ${IFVAR} is ${IFACE} converted to variable name bash allows
 #
-# For historical & compatbility reasons, preup is actually normally called in
-# the follow sequence: up ; preup ; up
-# In that case, the first up causes the kernel to initialize the device, so
-# that it is available for use in the preup function.  However, for some other
-# hardware, eg CAN devices, some configuration is needed before trying to up
-# the interface will actually work. For such harware, there are the
-# 'up_before_preup' variables, that skips the first up call.
-#up_before_preup_IFVAR=no
-#up_before_preup=no
+# For historical and compatibility reasons, preup is actually normally called
+# in the following sequence: up ; preup ; up.
+# The first up causes the kernel to initialize the device, so
+# that it is available for use in the preup function.  However, for some
+# hardware, e.g. CAN devices, some configuration is needed before trying to up
+# the interface will actually work. For such hardware, the
+# up_before_preup variables will allow skipping the first up call if set
+# to yes.
+#up_before_preup_IFVAR="NO"
+#up_before_preup="NO"
 
 #preup() {
 #	# Test for link on the interface prior to bringing it up.  This

[gentoo-commits] proj/openrc:master commit in: doc/

[William Hubbs]

commit:     476034dd9595c56dab4e19ce04424dcfd8431dea
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 16:51:42 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 18:32:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=476034dd

net.example: Fix the bridge configuration example

The example of how to configure the bridge was invalid. It showed
invalid timer settings along with turning off stp. This update shows how
to turn on stp and set the timer settings to the defaults.

Reported-by: Sergey S. Starikoff < Ikonta <AT> yandex.ru>
X-Gentoo-Bug: 389209
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=389209

---
 doc/net.example.Linux.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index cc759c7..7bae8d7 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -839,9 +839,9 @@
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
-#brctl_br0="setfd 0
-#sethello 0
-#stp off"
+#brctl_br0="setfd 15
+#sethello 2
+#stp on"
 
 # You can also configure the bridge or bridge members via sysfs on 2.6 kernels
 # or newer. See the kernel bridge documentation for a description of these

[gentoo-commits] proj/openrc:master commit in: doc/

[Mike Frysinger]

commit:     37294b4e82fc265941e385e6a5430792fa57ae46
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 20:32:08 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 20:33:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=37294b4e

net example: fix up grammar

X-Gentoo-Bug: 390295
X-Gentoo-Bug-URL: https://bugs.gentoo.org/390295
Reported-by: Patrick Lauer <patrick <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 doc/net.example.Linux.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index b841613..cc759c7 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -350,7 +350,7 @@
 # By default we don't wait for wpa_supplicant to associate and authenticate.
 # If you need to change this behaviour then you don't know how our scripts work
 # and setting this value could cause strange things to happen.
-# If you would like to, so can specify how long in seconds.
+# If you would like it to wait, you can specify how long in seconds.
 #associate_timeout_eth0=60
 # A value of 0 means wait forever.
 

[gentoo-commits] proj/openrc:master commit in: doc/

[Robin H. Johnson]

commit:     8a45d5e24e1c5ee40486d0baaf946edd92913ae4
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:54:48 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 07:54:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8a45d5e2

Bug #360963: Improve interface naming/set_name_type documentation on new vlan code.

This is primarily for users with set_name_type settings from previous
sysadmins can easily see what changes to make.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 doc/net.example.Linux.in |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 69c9ba6..424c677 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -540,11 +540,21 @@
 
 # You can also configure the VLAN - see for ip man page for more details
 # To change the vlan interface name. If not set, the standard "iface.vlanid"
-# will be used
+# will be used. This is the replacement for the old 'vconfig set_name_type'
+# functionality.
 #vlan1_name="vlan1"
 #vlan2_name="eth0.2"
+
+# The following shows the old set_name_type setting and what new option to set:
+# Using eth9 & VLAN VID 26 as an example.
+# VLAN_PLUS_VID         vlan26_name="vlan0026"
+# VLAN_PLUS_VID_NO_PAD  vlan26_name="vlan26"
+# DEV_PLUS_VID          vlan26_name="eth9.0026"
+# DEV_PLUS_VID_NO_PAD   vlan26_name="eth9.26"
+
 # Set the vlan flags
 #vlan1_flags="reorder_hdr off gvrp on loose_binding on"
+
 # Configure in/egress maps
 #vlan1_ingress="2:6 3:5"
 #vlan1_egress="1:2"