preinit: use grep -q where applicable
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 1 Feb 2010 00:34:10 +0000 (00:34 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 1 Feb 2010 00:34:10 +0000 (00:34 +0000)
SVN-Revision: 19480

target/linux/brcm-2.4/base-files/lib/preinit/05_set_failsafe_switch_brcm
target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm

index 28e62e5b57996b72a1d5e53b67acccc410f45236..a93559f97b40a980aeee9bd408269d8d54c6d664 100644 (file)
@@ -6,7 +6,7 @@ failsafe_ip() {
                echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
        }
        
-       [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
+       [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
                ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
         }
 }
index 9fd555caf699399b59350b247740112769a96241..1bef26bf00ae01cef9cb63f6a91c86f3d84efa74 100644 (file)
@@ -1,7 +1,7 @@
 #!/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