aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Domsch <Matt_Domsch@dell.com>2011-02-10 15:07:28 -0600
committerBill Nottingham <notting@redhat.com>2011-02-25 16:03:25 -0500
commitb5141c17bfc6ebfdaf440a1d997b7d897e242820 (patch)
treef2605ed07c05144e3f6457e3ba9b8680e252f91c
parent4688ea25c9a5a87e48f89fc91a3c93a7c8c95b4a (diff)
downloadinitscripts-b5141c17bfc6ebfdaf440a1d997b7d897e242820.tar
initscripts-b5141c17bfc6ebfdaf440a1d997b7d897e242820.tar.gz
initscripts-b5141c17bfc6ebfdaf440a1d997b7d897e242820.tar.bz2
initscripts-b5141c17bfc6ebfdaf440a1d997b7d897e242820.tar.xz
initscripts-b5141c17bfc6ebfdaf440a1d997b7d897e242820.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 1eaabab8..d296508b 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}?'