diff options
| author | Václav Pavlín <vpavlin@redhat.com> | 2012-09-05 13:32:12 +0200 |
|---|---|---|
| committer | Václav Pavlín <vpavlin@redhat.com> | 2012-09-05 13:32:12 +0200 |
| commit | 02ca71f53ca1fe26a416b20a8a6b392565f74b57 (patch) | |
| tree | 9f090c9f40f3888b522cf8923c880c685d34c513 /sysconfig | |
| parent | 8484d970b787ddaafb866e4a9291019afb252dab (diff) | |
| download | initscripts-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')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 5 |
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 |