SVN: rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan

[gotar]

Author: gotar
Date: Fri Feb 27 17:33:36 2009
New Revision: 10149

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan
Log:
- restored vconfig support for older iproute2 users


Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown-vlan	Fri Feb 27 17:33:36 2009
@@ -38,7 +38,16 @@
 
 ip link set ${DEVICE} down
 LC_ALL=C ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
-ip link del ${DEVICE}
+
+if (ip link help 2>&1 | grep -q del); then
+	/sbin/ip link del ${DEVICE}
+elif [ -x /sbin/vconfig ]; then
+	/sbin/vconfig rem ${DEVICE}
+else
+	nls "/sbin/vconfig or iproute2 with vlan support is missing. Can't continue."
+	exit 1
+fi
+
 RESULT=$?
 
 exit $RESULT