[backfire] merge r21417

[openwrt-10.03/.git] / target / linux / brcm-2.4 / base-files / lib / preinit / 15_set_preinit_interface_brcm

diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
index 0f6c19263cbc2946a566e7caac3d99ba9748c531..fdc7c71ca7e03ed78a96f6a56298af45b21e6fe7 100644 (file)
--- a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 port_net_echo() {
-       [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
+       [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
                if [ "$pi_preinit_net_messages" = "y" ] || [ "$pi_failsafe_net_message" = "true" ] && [ "$pi_preinit_no_failsafe_netmsg" != "y" ]; then 
                        netmsg $pi_broadcast "$1"
-               }
+               fi
        }
 }
 
@@ -12,7 +12,7 @@ preinit_ip_deconfig() {
        if [ -z "$pi_ifname" ]; then
                ifconfig $ifname 0.0.0.0 down
        else
-               grep "$pi_ifname" /proc/net/dev >/dev/null && {
+               grep -q "$pi_ifname" /proc/net/dev && {
                        ifconfig $pi_ifname 0.0.0.0 down
                }
        fi
@@ -30,9 +30,10 @@ preinit_net_echo() {
                        echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
                        port_net_echo $1
                }; done
+               
+               echo "0 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
+               
        } || port_net_echo $1
-
-       preinit_ip_deconfig
 }