diff options
| author | Miloslav Trmac <mitr@volny.cz> | 2006-07-28 03:56:50 +0000 |
|---|---|---|
| committer | Miloslav Trmac <mitr@volny.cz> | 2006-07-28 03:56:50 +0000 |
| commit | 7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085 (patch) | |
| tree | 81c5b766ecf0e6bceba47cd2b0b5329b9309e771 /sysconfig/network-scripts | |
| parent | 5ae8842118c2b266d771df3722b84bd954ce3b6f (diff) | |
| download | initscripts-7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085.tar initscripts-7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085.tar.gz initscripts-7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085.tar.bz2 initscripts-7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085.tar.xz initscripts-7795bfc3de4bdf0bc1dbd24b4a12a0fbcbff4085.zip | |
Support (ifup vlan1:0) (#193133)
Diffstat (limited to 'sysconfig/network-scripts')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 4 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 4 |
2 files changed, 5 insertions, 3 deletions
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} |