diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-11-20 21:19:42 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-11-20 21:19:42 +0000 |
| commit | 90b02e5d54a7ca13174ae2e6a98ab943ef098bef (patch) | |
| tree | 29c9cddb72a9e0902fbe0b66537f36a3ac39c55d | |
| parent | 43e14799e6f78e45b990e447d1f204eb2eea238d (diff) | |
| download | initscripts-90b02e5d54a7ca13174ae2e6a98ab943ef098bef.tar.gz initscripts-90b02e5d54a7ca13174ae2e6a98ab943ef098bef.tar.xz initscripts-90b02e5d54a7ca13174ae2e6a98ab943ef098bef.zip | |
- ifup: support aliases-on-vlan (#193133, <mitr@redhat.com>)
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | 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, <jorton@redhat.com>) +- ifup: support aliases-on-vlan (#193133, <mitr@redhat.com>) * Fri Apr 21 2006 Miloslav Trmac <mitr@redhat.com> - 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} |