From 358cb3c0c8feed5ecfaa8ebfc56b7742b88bb14a Mon Sep 17 00:00:00 2001 From: Denny Khoerniawan Date: Wed, 15 Nov 2017 14:02:49 -0500 Subject: [PATCH] ifup-eth stop waiting if link is up --- sysconfig/network-scripts/ifup-eth | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 192ad18..4b8b992 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -168,7 +168,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then /sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning done - [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} + check_link_down ${DEVICE} # add the bits to setup the needed post enslavement parameters for arg in $BONDING_OPTS ; do @@ -188,7 +188,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then /sbin/ip addr flush dev ${DEVICE} 2>/dev/null /sbin/ip link set dev ${DEVICE} up ethtool_set - [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} + check_link_down ${DEVICE} /usr/sbin/brctl addif -- ${BRIDGE} ${DEVICE} # add the bits to setup driver parameters here for arg in $BRIDGING_OPTS ; do @@ -244,7 +244,7 @@ else # enable device without IP, useful for e.g. PPPoE ip link set dev ${REALDEVICE} up ethtool_set - [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} + check_link_down ${REALDEVICE} else expand_config @@ -259,7 +259,7 @@ else ethtool_set - [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} + check_link_down ${REAL_DEVICE} if [ "${DEVICE}" = "lo" ]; then SCOPE="scope host" -- 1.8.3.1