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:39:26 +0200 |
| commit | 30483d5b4a4763e03dcc2462a4621b76568ab1b3 (patch) | |
| tree | 0982df3472f40c14844adef41f7bdeba5337eb0e /sysconfig | |
| parent | 5afd0fba8e67c3966e29d7b0f40f4085b6783d7b (diff) | |
| download | initscripts-30483d5b4a4763e03dcc2462a4621b76568ab1b3.tar initscripts-30483d5b4a4763e03dcc2462a4621b76568ab1b3.tar.gz initscripts-30483d5b4a4763e03dcc2462a4621b76568ab1b3.tar.bz2 initscripts-30483d5b4a4763e03dcc2462a4621b76568ab1b3.tar.xz initscripts-30483d5b4a4763e03dcc2462a4621b76568ab1b3.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 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 |