hide some non-critical error messages; prevent newbie bug reports

SVN-Revision: 1028

diff --git a/openwrt/target/default/target_skeleton/bin/firstboot b/openwrt/target/default/target_skeleton/bin/firstboot
index 2e7481db8105ea306f07d704d85b61628278689b..cef258cf3980fcbe48bb70170ef9888020d43995 100755 (executable)
--- a/openwrt/target/default/target_skeleton/bin/firstboot
+++ b/openwrt/target/default/target_skeleton/bin/firstboot
@@ -1,6 +1,11 @@
 #!/bin/sh
 # $Id$
 
+mount | grep squashfs >&- || {
+       echo "You do not have a squashfs partition; aborting"
+       echo "(firstboot cannot be run on jffs2 based firmwares)"
+       return
+}
 
 [ -f "/tmp/.firstboot" ] && {
        echo "firstboot is already running"

diff --git a/openwrt/target/default/target_skeleton/etc/init.d/rcS b/openwrt/target/default/target_skeleton/etc/init.d/rcS
index d52152c31a61f1dfd5d9813794719e3de7d9267a..eeed18b77014c39da1ddd81135993c27477f546e 100755 (executable)
--- a/openwrt/target/default/target_skeleton/etc/init.d/rcS
+++ b/openwrt/target/default/target_skeleton/etc/init.d/rcS
@@ -1,6 +1,6 @@
 #!/bin/sh
 syslogd -C 16
 klogd
-for i in /etc/init.d/S* ;do
-  $i start 2>&1 | logger -s -p 6 -t ''
-done
+for i in /etc/init.d/S*; do
+  $i start 2>&1
+done | logger -s -p 6 -t ''

diff --git a/openwrt/target/default/target_skeleton/sbin/ifup b/openwrt/target/default/target_skeleton/sbin/ifup
index f3230ba410a5cca8b9657f3b7a0ce5cb4d7f68ac..9759f8d4d516ab79debfa2c0e041ec6f2a8a284b 100755 (executable)
--- a/openwrt/target/default/target_skeleton/sbin/ifup
+++ b/openwrt/target/default/target_skeleton/sbin/ifup
@@ -10,10 +10,10 @@
 
   if_valid $if || return
 
-  $DEBUG ifconfig $if down
+  $DEBUG ifconfig $if down 2>&-
   if [ "${if%%[0-9]}" = "br" ]; then
     stp=$(nvram get ${type}_stp)
-    $DEBUG brctl delbr $if
+    $DEBUG brctl delbr $if 2>&-
     $DEBUG brctl addbr $if
     $DEBUG brctl setfd $if 0
     $DEBUG brctl stp $if ${stp:-0}

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index 7a8184745ddcfa3b8f176941693159f7405dc0d4..eef55b4bdb544dabf845daa0bf3499229239a08d 100755 (executable)
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/target/default/target_skeleton/sbin/mount_root
@@ -17,7 +17,7 @@ if [ "$1" != "failsafe" ]; then
                pivot_root /jffs /jffs/rom
                mount none /proc -t proc
                mount none /dev -t devfs
-               umount rom/proc rom/dev
+               umount /rom/proc rom/dev >&-
        fi
 fi
 mount none /tmp -t tmpfs size=50%