X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fnetwork%2Fconfig.sh;h=98d6f13509da999b212beb870ac1285b954cf308;hb=bb7ec42ea86ecc76db276ef19d445c1a3954a382;hp=b8f350de844ffef2fdc0ebf3364fc4e225773105;hpb=8e85aed5aa25e3d0d8d2f569df9e4aa037ce2cce;p=openwrt-10.03%2F.git diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index b8f350de8..98d6f1350 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -74,7 +74,7 @@ prepare_interface() { # if we're called for the bridge interface itself, don't bother trying # to create any interfaces here. The scripts have already done that, otherwise # the bridge interface wouldn't exist. - [ "br-$config" = "$iface" -o -f "$iface" ] && return 0; + [ "br-$config" = "$iface" -o -e "$iface" ] && return 0; ifconfig "$iface" 2>/dev/null >/dev/null && { # make sure the interface is removed from any existing bridge and brought down @@ -138,7 +138,8 @@ setup_interface() { # Interface settings config_get mtu "$config" mtu config_get macaddr "$config" macaddr - $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up + grep "$iface:" /proc/net/dev > /dev/null && \ + $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up uci set "/var/state/network.$config.ifname=$iface" pidfile="/var/run/$iface.pid"