From 0dc9c4c30bd3e600809c64c4f8ca244c23e89888 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 23 May 2005 21:44:17 +0000
Subject: hide some non-critical error messages; prevent newbie bug reports

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1028 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/target/default/target_skeleton/bin/firstboot   | 5 +++++
 openwrt/target/default/target_skeleton/etc/init.d/rcS  | 6 +++---
 openwrt/target/default/target_skeleton/sbin/ifup       | 4 ++--
 openwrt/target/default/target_skeleton/sbin/mount_root | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'openwrt/target')

diff --git a/openwrt/target/default/target_skeleton/bin/firstboot b/openwrt/target/default/target_skeleton/bin/firstboot
index 2e7481db8..cef258cf3 100755
--- 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 d52152c31..eeed18b77 100755
--- 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 f3230ba41..9759f8d4d 100755
--- 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 7a8184745..eef55b4bd 100755
--- 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%
-- 
cgit v1.2.3