From 3e95620ace47c8f1f732d3efc963b8dc5a92f4e6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 30 Mar 2005 16:50:55 +0000
Subject: handle alternate vlan naming schemes (#115001)

---
 sysconfig/network-scripts/ifdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sysconfig/network-scripts/ifdown')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index cc6f795e..445c87c8 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -140,7 +140,8 @@ fi
 
 if [ -n "$VLAN" -a -x /sbin/vconfig ]; then
     # 802.1q VLAN
-    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then
+    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' \
+	|| echo ${DEVICE} | LANG=C egrep -q 'vlan[0-9][0-9]?[0-9]?[0-9]?' ; then
 	[ -f /proc/net/vlan/${DEVICE} ] && {
 	    /sbin/vconfig rem ${DEVICE}
 	}
-- 
cgit