diff options
| author | Bill Nottingham <notting@redhat.com> | 2003-02-04 02:19:20 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2003-02-04 02:19:20 +0000 |
| commit | 6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff (patch) | |
| tree | 07a4fe99518a53ba17ba871ebe2d9651b917158c /sysconfig/network-scripts/ifdown | |
| parent | f1d0cc482fd5e6376275e6cc4103292bbb2bc17d (diff) | |
| download | initscripts-6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff.tar initscripts-6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff.tar.gz initscripts-6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff.tar.bz2 initscripts-6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff.tar.xz initscripts-6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff.zip | |
vlan fixes (<tis@foobar.fi>)
Diffstat (limited to 'sysconfig/network-scripts/ifdown')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 29fb9674..c16f251f 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -46,7 +46,7 @@ fi . /etc/sysconfig/network # Check to make sure the device is actually up -check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && exit 0 +check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0 if [ -n "${HWADDR}" ]; then FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} | \ @@ -127,7 +127,6 @@ if [ -n "$VLAN" -a -x /sbin/vconfig ]; then if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q 'eth[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then [ -f /proc/net/vlan/${DEVICE} ] && { /sbin/vconfig rem ${DEVICE} - retcode=$? } fi fi |