--- network.orig 2005-06-27 16:13:13 +0400 +++ network.orig 2005-07-04 12:37:47 +0400 @@ -29,7 +29,7 @@ if [ -r "$NAMEFILE" -a "$ACTION" != "start" ] ; then DEVICE=`cat $NAMEFILE` fi -HWADDR=`/sbin/ifconfig $DEVICE | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p'` +HWADDR=`/sbin/ip -o link show dev $DEVICE | sed 's/.*link\///' | cut -d' ' -f2 | tr 'a-f' 'A-F'` # Load site-specific settings ADDRESS="$SCHEME,$SOCKET,$INSTANCE,$HWADDR" @@ -62,7 +62,7 @@ 'check') is_true $NO_CHECK && exit 0 - /sbin/ifconfig $DEVICE | grep -q RUNNING || exit 0 + /sbin/ip -o link show dev $DEVICE 2>/dev/null | cut -d' ' -f3 | grep -qs '[<,]UP[,>]' || exit 0 # Check for any in-use NFS mounts nfscheck ()