[package] base-files: preinit: get rid of /dev/null redirections and use grep -q...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19478 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 12b08a2..6337643 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -161,6 +161,10 @@ setup_interface_none() {
        env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
 }
 
        env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
 }
 

+stop_interface_none() {
+       env -i ACTION="ifdown" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
+}
+

 setup_interface_static() {
        local iface="$1"
        local config="$2"
 setup_interface_static() {
        local iface="$1"
        local config="$2"

diff --git a/package/base-files/files/lib/preinit/10_check_for_mtd b/package/base-files/files/lib/preinit/10_check_for_mtd
index e1f3c07..66f185e 100644 (file)
--- a/package/base-files/files/lib/preinit/10_check_for_mtd
+++ b/package/base-files/files/lib/preinit/10_check_for_mtd
@@ -10,7 +10,7 @@ mount_no_mtd() {
 
 check_for_mtd() {
     check_skip || {
 
 check_for_mtd() {
     check_skip || {

-       grep rootfs_data /proc/mtd >/dev/null 2>/dev/null || {
+       grep -qs rootfs_data /proc/mtd || {

            mount_no_mtd && pi_mount_skip_next=true
        }
     }
            mount_no_mtd && pi_mount_skip_next=true
        }
     }

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index cd3ca55..ab69305 100644 (file)
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -9,19 +9,19 @@ preinit_ip() {
        pi_ifname=$ifname    
     fi
 
        pi_ifname=$ifname    
     fi
 

-    [ -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
     }
 }
 
 preinit_ip_deconfig() {
        ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
     }
 }
 
 preinit_ip_deconfig() {

-    [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
+    [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {

        ifconfig $pi_ifname 0.0.0.0 down
     }
 }
 
 preinit_net_echo() {
        ifconfig $pi_ifname 0.0.0.0 down
     }
 }
 
 preinit_net_echo() {

-       [ -n "$pi_ifname" ] && grep "$pi_ifname" /proc/net/dev >/dev/null && {
+       [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {

                { 
                        [ "$pi_preinit_net_messages" = "y" ] || {
                                [ "$pi_failsafe_net_message"  = "true" ] && 
                { 
                        [ "$pi_preinit_net_messages" = "y" ] || {
                                [ "$pi_failsafe_net_message"  = "true" ] && 

diff --git a/package/base-files/files/lib/preinit/30_device_fs_daemons b/package/base-files/files/lib/preinit/30_device_fs_daemons
index 5a3aaf3..5b3e2ad 100644 (file)
--- a/package/base-files/files/lib/preinit/30_device_fs_daemons
+++ b/package/base-files/files/lib/preinit/30_device_fs_daemons
@@ -23,7 +23,7 @@ init_udev() {
 
 init_device_fs() {
     HOTPLUG=
 
 init_device_fs() {
     HOTPLUG=

-    if grep devfs /proc/filesystems > /dev/null; then
+    if grep -q devfs /proc/filesystems; then

        init_devfs
     elif [ -x /sbin/hotplug2 ]; then
        init_hotplug2
        init_devfs
     elif [ -x /sbin/hotplug2 ]; then
        init_hotplug2

diff --git a/package/base-files/files/lib/preinit/50_choose_console b/package/base-files/files/lib/preinit/50_choose_console
index 3464796..ecbc2ea 100644 (file)
--- a/package/base-files/files/lib/preinit/50_choose_console
+++ b/package/base-files/files/lib/preinit/50_choose_console
@@ -7,7 +7,7 @@ choose_console() {
     # that's why we use /dev/pty/m0 and m1 (or equivalent) as replacement
     # for /dev/console if there's no serial console available
 
     # that's why we use /dev/pty/m0 and m1 (or equivalent) as replacement
     # for /dev/console if there's no serial console available
 

-    if grep devfs /proc/filesystems > /dev/null; then
+    if grep -q devfs /proc/filesystems; then

        M0=/dev/pty/m0
        M1=/dev/pty/m1
        M2=/dev/pty/m1
        M0=/dev/pty/m0
        M1=/dev/pty/m1
        M2=/dev/pty/m1