| 1 |
slords |
1.1 |
From 30483d5b4a4763e03dcc2462a4621b76568ab1b3 Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com> |
| 3 |
|
|
Date: Wed, 5 Sep 2012 13:32:12 +0200 |
| 4 |
|
|
Subject: [PATCH] Be less strict about VLAN name (#505314) |
| 5 |
|
|
|
| 6 |
|
|
--- |
| 7 |
|
|
sysconfig/network-scripts/ifdown-eth | 5 +---- |
| 8 |
|
|
1 file changed, 1 insertion(+), 4 deletions(-) |
| 9 |
|
|
|
| 10 |
|
|
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth |
| 11 |
|
|
index e61bfab..f256d57 100755 |
| 12 |
|
|
--- a/sysconfig/network-scripts/ifdown-eth |
| 13 |
|
|
+++ b/sysconfig/network-scripts/ifdown-eth |
| 14 |
|
|
@@ -157,11 +157,8 @@ fi |
| 15 |
|
|
|
| 16 |
|
|
if [ -n "$VLAN" ]; then |
| 17 |
|
|
# 802.1q VLAN |
| 18 |
|
|
- 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]?' \ |
| 19 |
|
|
- || echo ${DEVICE} | LANG=C egrep -q 'vlan[0-9][0-9]?[0-9]?[0-9]?' ; then |
| 20 |
|
|
- [ -f /proc/net/vlan/${DEVICE} ] && { |
| 21 |
|
|
+ if [ -f /proc/net/vlan/${DEVICE} ]; then |
| 22 |
|
|
ip link delete ${DEVICE} type vlan |
| 23 |
|
|
- } |
| 24 |
|
|
fi |
| 25 |
|
|
fi |
| 26 |
|
|
|
| 27 |
|
|
-- |
| 28 |
|
|
1.7.11.4 |
| 29 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
