aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Domsch <Matt_Domsch@dell.com>2011-02-10 15:07:28 -0600
committerPetr Lautrbach <plautrba@redhat.com>2011-03-10 12:41:20 +0100
commit368c219887e76664b8c3a374c9dd3086d0078759 (patch)
tree9ac108704e0e7f837faae57842a888fa24f36a46
parent9bb957b94b70065a49531672aa010aff517c24df (diff)
downloadinitscripts-368c219887e76664b8c3a374c9dd3086d0078759.tar
initscripts-368c219887e76664b8c3a374c9dd3086d0078759.tar.gz
initscripts-368c219887e76664b8c3a374c9dd3086d0078759.tar.bz2
initscripts-368c219887e76664b8c3a374c9dd3086d0078759.tar.xz
initscripts-368c219887e76664b8c3a374c9dd3086d0078759.zip
remove network device naming requirement from VLAN devices
-rwxr-xr-xsysconfig/network-scripts/ifup4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 56b2d6e9..43c7df04 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -73,9 +73,9 @@ fi
# Ethernet 802.1Q VLAN support
if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then
VID=""
- MATCH='^(eth|hsi|bond)[0-9]+\.[0-9]{1,4}$'
+ MATCH='^.+\.[0-9]{1,4}$'
if [[ "${DEVICE}" =~ $MATCH ]]; then
- VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^[a-z0-9]*\.0*\([0-9]\+\)/\1/')
+ VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^.*\.\([0-9]\+\)/\1/')
PHYSDEV=${DEVICE%.*}
fi
MATCH='^vlan[0-9]{1,4}?'