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

(-)network.orig (-2 / +2 lines)
Lines 29-35 Link Here
29
if [ -r "$NAMEFILE" -a "$ACTION" != "start" ] ; then
29
if [ -r "$NAMEFILE" -a "$ACTION" != "start" ] ; then
30
    DEVICE=`cat $NAMEFILE`
30
    DEVICE=`cat $NAMEFILE`
31
fi
31
fi
32
HWADDR=`/sbin/ifconfig $DEVICE | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p'`
32
HWADDR=`/sbin/ip -o link show dev $DEVICE | sed 's/.*link\///' | cut -d' ' -f2 | tr 'a-f' 'A-F'`
33
33
34
# Load site-specific settings
34
# Load site-specific settings
35
ADDRESS="$SCHEME,$SOCKET,$INSTANCE,$HWADDR"
35
ADDRESS="$SCHEME,$SOCKET,$INSTANCE,$HWADDR"
Lines 62-68 Link Here
62
62
63
'check')
63
'check')
64
    is_true $NO_CHECK && exit 0
64
    is_true $NO_CHECK && exit 0
65
    /sbin/ifconfig $DEVICE | grep -q RUNNING || exit 0
65
    /sbin/ip -o link show dev $DEVICE 2>/dev/null | cut -d' ' -f3 | grep -qs '[<,]UP[,>]' || exit 0
66
66
67
    # Check for any in-use NFS mounts
67
    # Check for any in-use NFS mounts
68
    nfscheck ()
68
    nfscheck ()

Return to bug 7224