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

---
 rc.d/init.d/network              |  3 ++-
 sysconfig/network-scripts/ifdown |  3 ++-
 sysconfig/network-scripts/ifup   | 28 ++++++++++++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 1830ec4e..93573b5b 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -85,7 +85,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
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 3b97a4c6..4242baab 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -123,7 +123,8 @@ fi
 
 if [ -n "$VLAN" -a -x /sbin/vconfig ]; then
     # 802.1q VLAN
-    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then
+    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' \
+	|| echo ${DEVICE} | LANG=C egrep -q 'vlan[0-9][0-9]?[0-9]?[0-9]?' ; then
 	[ -f /proc/net/vlan/${DEVICE} ] && {
 	    /sbin/vconfig rem ${DEVICE}
 	}
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 17ad0804..7bd2ce01 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -55,10 +55,28 @@ fi
 
 # Ethernet 802.1Q VLAN support
 if [ -x /sbin/vconfig -a "${VLAN}" = "yes" ]; then
-    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then
+    VID=""
+    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?'; then
+	VID="`echo ${DEVICE} | \
+	    LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \
+	    LANG=C sed 's/^[a-z0-9]*\.//g;s/^0*//'`"
+	PHYSDEV="`echo ${DEVICE} | \
+	    LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \
+	    LANG=C sed 's/\.[a-z0-9]*$//g'`"
+     fi
+     if echo ${DEVICE} | LANG=C egrep -q 'vlan[0-9][0-9]?[0-9]?[0-9]?'; then
+	VID="`echo ${DEVICE} | LANG=C sed 's/^vlan//;s/^0*//'`"
+	# PHYSDEV should be set in ifcfg-vlan* file
+	if test -z "$PHYSDEV"; then
+		echo $"PHYSDEV should be set for device ${DEVICE}"
+		exit 1
+	fi
+     fi
+     if [ -n "$VID" ]; then
 	if [ ! -d /proc/net/vlan ]; then
             if modprobe 8021q >/dev/null 2>&1 ; then
-		/sbin/vconfig set_name_type DEV_PLUS_VID_NO_PAD >/dev/null 2>&1 || {
+		test -z "$VLAN_NAME_TYPE" && VLAN_NAME_TYPE=DEV_PLUS_VID_NO_PAD
+		/sbin/vconfig set_name_type "$VLAN_NAME_TYPE" >/dev/null 2>&1 || {
 		    echo $"Could not set 802.1Q VLAN parameters."
 		}
 	    else
@@ -66,12 +84,6 @@ if [ -x /sbin/vconfig -a "${VLAN}" = "yes" ]; then
 		exit 1
 	    fi
 	fi
-	VID="`echo ${DEVICE} | \
-	    LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \
-	    LANG=C sed 's/^[a-z0-9]*\.//g;s/^0*//'`"
-	PHYSDEV="`echo ${DEVICE} | \
-	    LANG=C egrep '(eth|bond)[0-9]+\.[0-9][0-9]?[0-9]?[0-9]?$' | \
-	    LANG=C sed 's/\.[a-z0-9]*$//g'`"
 
 	is_available ${PHYSDEV} || {
 	    if [ "$?" = "1" ] ; then
-- 
cgit v1.2.1