aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorVáclav Pavlín <vpavlin@redhat.com>2012-09-05 13:32:12 +0200
committerVáclav Pavlín <vpavlin@redhat.com>2012-09-05 13:32:12 +0200
commit02ca71f53ca1fe26a416b20a8a6b392565f74b57 (patch)
tree9f090c9f40f3888b522cf8923c880c685d34c513 /sysconfig/network-scripts
parent8484d970b787ddaafb866e4a9291019afb252dab (diff)
downloadinitscripts-02ca71f53ca1fe26a416b20a8a6b392565f74b57.tar
initscripts-02ca71f53ca1fe26a416b20a8a6b392565f74b57.tar.gz
initscripts-02ca71f53ca1fe26a416b20a8a6b392565f74b57.tar.bz2
initscripts-02ca71f53ca1fe26a416b20a8a6b392565f74b57.tar.xz
initscripts-02ca71f53ca1fe26a416b20a8a6b392565f74b57.zip
Be less strict about VLAN name (#505314)
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifdown-eth5
1 files changed, 1 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index 036701c2..9c78d4fe 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -158,11 +158,8 @@ fi
if [ -n "$VLAN" ]; then
# 802.1q VLAN
- if echo ${DEVICE} | LANG=C grep -Ev '(:)' | LANG=C grep -Eq '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' \
- || echo ${DEVICE} | LANG=C grep -Eq '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