=== modified file 'network-hooks.d/bridge' --- network-hooks.d/bridge 2012-01-01 17:38:33 +0000 +++ network-hooks.d/bridge 2012-01-15 16:10:09 +0000 @@ -20,7 +20,7 @@ addrtoif(){ grep -liFe "$1" /sys/class/net/*/address \ - | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' + | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d" } # Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and @@ -37,7 +37,8 @@ exit fi -for b in /sbin/brctl /usr/sbin/brctl; do +brctl="/sbin/brctl" +for b in "$brctl" /usr/sbin/brctl; do if [ -e "$b" ]; then brctl="$b" break @@ -53,7 +54,7 @@ ip link set dev "$interface" up done ip link set dev "$BRIDGE" up - sleep "$DELAY" + sleep "${DELAY%%.*}" if [ -n "$IPADDRS" ]; then for ipaddr in $IPADDRS; do ip addr add "$ipaddr" dev "$BRIDGE"