From 30483d5b4a4763e03dcc2462a4621b76568ab1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
Date: Wed, 5 Sep 2012 13:32:12 +0200
Subject: Be less strict about VLAN name (#505314)

---
 sysconfig/network-scripts/ifdown-eth | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index e61bfaba..f256d572 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -157,11 +157,8 @@ fi
 
 if [ -n "$VLAN" ]; 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]?' \
-	|| echo ${DEVICE} | LANG=C egrep -q 'vlan[0-9][0-9]?[0-9]?[0-9]?' ; then
-	[ -f /proc/net/vlan/${DEVICE} ] && {
+    if [ -f /proc/net/vlan/${DEVICE} ]; then
 	    ip link delete ${DEVICE} type vlan
-	}
     fi
 fi
 
-- 
cgit v1.2.1