From 6d46cedaad0acbdb6dd650f7c7d19af4b19d3bff Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 4 Feb 2003 02:19:20 +0000
Subject: vlan fixes (<tis@foobar.fi>)

---
 sysconfig/network-scripts/ifdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sysconfig/network-scripts/ifdown')

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
-- 
cgit v1.2.1