From 90b02e5d54a7ca13174ae2e6a98ab943ef098bef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 20 Nov 2006 21:19:42 +0000 Subject: - ifup: support aliases-on-vlan (#193133, ) --- initscripts.spec | 1 + sysconfig/network-scripts/ifup | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 633b25a1..72b1ddf9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -212,6 +212,7 @@ rm -rf $RPM_BUILD_ROOT - netfs: call multipath, kpartx if necessary (#180977) - rc.sysinit: run zfcpconf.sh earlier, so devices are available for LVM usage (#189494) - init.d/functions: add configurable delay for killproc (#198468, ) +- ifup: support aliases-on-vlan (#193133, ) * Fri Apr 21 2006 Miloslav Trmac - 7.93.25.EL-1 - Document HOTPLUG (#189509) diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 43fbf1c5..be400a30 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -58,9 +58,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*//'`" @@ -228,7 +228,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