From 132718bb1b966d026791bb970f3258753aec9752 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 30 Mar 2005 16:49:09 +0000
Subject: handle alternate vlan naming schemes (#115001)

---
 rc.d/init.d/network | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 8106ccde..535fbf58 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -77,7 +77,8 @@ case "$1" in
 	case "$VLAN" in
 	  yes)
 	    if [ -d /proc/net/vlan ] || modprobe 8021q >/dev/null 2>&1 ; then
-		action $"Setting 802.1Q VLAN parameters: " /sbin/vconfig set_name_type DEV_PLUS_VID_NO_PAD
+		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
 		echo $"No 802.1Q VLAN support available in kernel."
 	    fi
-- 
cgit v1.2.1