View | Details | Raw Unified | Return to bug 3893
Collapse All | Expand All

(-)net-scripts-0.4.3/sysconfig/network-scripts/ifup.orig (+10 lines)
Lines 256-261 Link Here
256
ZCIP_ARGS="-s -i $DEVICE"
256
ZCIP_ARGS="-s -i $DEVICE"
257
257
258
if [ -n "$DYNCONFIG" ]; then
258
if [ -n "$DYNCONFIG" ]; then
259
    check_eth_link
260
    if [ "$?" = 1 ]; then
261
	echo -n "link is down, DHCP discovery is impossible"
262
	exit 1
263
    fi
259
    echo -n "Determining IP information for $DEVICE via ${DHCP_CLIENT##*/}..."
264
    echo -n "Determining IP information for $DEVICE via ${DHCP_CLIENT##*/}..."
260
    if $DHCP_CLIENT $DHCP_ARGS; then
265
    if $DHCP_CLIENT $DHCP_ARGS; then
261
	echo " done."
266
	echo " done."
Lines 273-278 Link Here
273
	exit 1
278
	exit 1
274
    fi
279
    fi
275
elif [ "$BOOTPROTO" = zcip ]; then
280
elif [ "$BOOTPROTO" = zcip ]; then
281
    check_eth_link
282
    if [ "$?" = 1 ]; then
283
	echo -n "link is down, ZeroConf discovery is impossible"
284
	exit 1
285
    fi
276
    echo -n "Determining IP information for $DEVICE via ${ZCIP##*/}..."
286
    echo -n "Determining IP information for $DEVICE via ${ZCIP##*/}..."
277
    if $ZCIP $ZCIP_ARGS; then
287
    if $ZCIP $ZCIP_ARGS; then
278
	echo " done."
288
	echo " done."
(-)net-scripts-0.4.3/sysconfig/network-scripts/network-functions.orig (+12 lines)
Lines 123-125 Link Here
123
        fi
123
        fi
124
    fi
124
    fi
125
}
125
}
126
127
check_eth_link ()
128
{
129
    local IFSTATUS
130
    local res
131
    IFSTATUS=/sbin/ifstatus
132
    [ -x $IFSTATUS ] || return 0
133
    $IFSTATUS -q $DEVICE 
134
    res=$?
135
    [ "$res" = 3 ] && return 1
136
    return 0
137
}

Return to bug 3893