From 7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@volny.cz>
Date: Fri, 28 Jul 2006 03:56:50 +0000
Subject: Support (ifup vlan1:0) (#193133)

---
 sysconfig/network-scripts/ifup     | 4 ++--
 sysconfig/network-scripts/ifup-eth | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 1406a74e..f9b7f51c 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -60,9 +60,9 @@ then
 fi
 
 # Ethernet 802.1Q VLAN support
-if [ -x /sbin/vconfig -a "${VLAN}" = "yes" ]; then
+if [ -x /sbin/vconfig -a "${VLAN}" = "yes" -a "$ISALIAS" = "no" ]; 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
+    if echo ${DEVICE} | 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*//'`"
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index e36691a2..cbea96a2 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -114,7 +114,9 @@ fi
 
 # Bonding initialization. For DHCP, we need to enslave the devices early,
 # so it can actually get an IP.
-if [ "${TYPE}" =  "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then
+if [ "$ISALIAS" = no ] && \
+    { [ "${TYPE}" =  "Bonding" ] \
+      || ethtool -i $DEVICE 2>/dev/null | grep -q "driver: bonding"; } then
     /sbin/ip link set dev ${DEVICE} down
     /sbin/ip link set dev ${DEVICE} up
     [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
-- 
cgit v1.2.1