diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-05-13 12:44:08 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-05-13 12:44:08 -0400 |
| commit | 40f6bf883eb73a7b12a45ca063c1b765ee063275 (patch) | |
| tree | 4964e70e7fd2cde169ce631f77a2287bb93b643d | |
| parent | a8b4a9d667c0b07eea7cecddd87dabe35cc2dc74 (diff) | |
| download | initscripts-40f6bf883eb73a7b12a45ca063c1b765ee063275.tar initscripts-40f6bf883eb73a7b12a45ca063c1b765ee063275.tar.gz initscripts-40f6bf883eb73a7b12a45ca063c1b765ee063275.tar.bz2 initscripts-40f6bf883eb73a7b12a45ca063c1b765ee063275.tar.xz initscripts-40f6bf883eb73a7b12a45ca063c1b765ee063275.zip | |
Clean up some leftover VLAN code; clarify documentation.
| -rw-r--r-- | sysconfig.txt | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 6f64be63..1d0f6442 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -714,7 +714,7 @@ Files in /etc/sysconfig/network-scripts/ Ethernet 802.1q VLAN items: DEVICE=eth0.42 - Initscripts use DEVICE for VLAN devices. + Initscripts use the device name for VLAN devices. Example: eth0.42 for vlan 42 on device eth0. Valid VLAN ID range is 0-4095. Most ethernet switches reserve VLAN ID 1 to be used as management VLAN; starting from VLAN diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index c15d1d2a..d7bd6721 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -95,8 +95,6 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then fi fi - test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD - is_available ${PHYSDEV} || { if [ "$?" = "1" ] ; then echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization." |