From 286e6430ce2b1873e319e5edfa08c45806fbedab Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 12 May 2010 14:00:11 +0200
Subject: use ip command for vlan instead of vconfig

---
 rc.d/init.d/network | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'rc.d/init.d')

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 9e0fc2a0..232f3e2c 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -34,9 +34,6 @@ fi
 # if the ip configuration utility isn't around we can't function.
 [ -x /sbin/ip ] || exit 1
 
-# Even if VLAN is configured, without the utility we can't do much
-[ ! -x /sbin/vconfig ] && VLAN=
-
 CWD=$(pwd)
 cd /etc/sysconfig/network-scripts
 
@@ -69,10 +66,7 @@ case "$1" in
 
 	case "$VLAN" in
 	  yes)
-	    if [ -d /proc/net/vlan ] || modprobe 8021q >/dev/null 2>&1 ; then
-		test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD
-		action $"Setting 802.1Q VLAN parameters: " /sbin/vconfig set_name_type "$VLAN_NAME_TYPE"
-	    else
+	    if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then
 		echo $"No 802.1Q VLAN support available in kernel."
 	    fi
 	    ;;
-- 
cgit v1.2.1