From 40e485049cd0df623662e1c1517dc45c6926d4bd Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 26 Mar 2006 22:54:12 +0000
Subject: [PATCH] prevent (harmless) error messages to show up

SVN-Revision: 3503
---
 openwrt/package/base-files/default/etc/functions.sh        | 4 ++--
 openwrt/package/base-files/default/etc/preinit             | 2 +-
 openwrt/package/base-files/default/sbin/ifdown             | 2 +-
 .../base-files/default/usr/share/udhcpc/default.script     | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/openwrt/package/base-files/default/etc/functions.sh b/openwrt/package/base-files/default/etc/functions.sh
index 54b0a906c1..d9ffc722f7 100755
--- a/openwrt/package/base-files/default/etc/functions.sh
+++ b/openwrt/package/base-files/default/etc/functions.sh
@@ -61,9 +61,9 @@ do_ifup() {
 		DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
 		[ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
 		[ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-		oldpid=$(cat $pidfile)
+		[ -r $pidfile ] && oldpid=$(cat $pidfile 2>&-)
 		${DEBUG:-eval} "udhcpc $DHCP_ARGS"
-		pidof udhcpc | grep "$oldpid" >&- 2>&- && {
+		[ -n "$oldpid" ] && pidof udhcpc | grep "$oldpid" >&- 2>&- && {
 			sleep 1
 			kill -9 $oldpid
 		}
diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index 4b57799d0c..04454f8a95 100755
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -34,7 +34,7 @@ netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
 
 sleep 2
 
-if [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
+if [ "$(cat /proc/sys/reset 2>&-)" = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 	export FAILSAFE=true
 	[ "$(nvram get boot_wait)" != "on" ] && {
diff --git a/openwrt/package/base-files/default/sbin/ifdown b/openwrt/package/base-files/default/sbin/ifdown
index 4c24fc7d6f..5f245fe83b 100755
--- a/openwrt/package/base-files/default/sbin/ifdown
+++ b/openwrt/package/base-files/default/sbin/ifdown
@@ -8,7 +8,7 @@ debug "### ifdown $type ###"
 if=$(nvram get ${type}_ifname)
 proto=$(nvram get ${type}_proto)
 if_valid $if && $DEBUG ifconfig $if down
-kill $(cat /var/run/${if}.pid 2>&-) 2>&-
+[ -r /var/run/${if}.pid ] && kill $(cat /var/run/${if}.pid 2>&-) 2>&-
 killall ifup.$proto >&- 2>&-
 case "$proto" in
 	pptp|pppoe) killall pppd >&- 2>&- ;;
diff --git a/openwrt/package/base-files/default/usr/share/udhcpc/default.script b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
index 9fac6286c9..e94ef02694 100755
--- a/openwrt/package/base-files/default/usr/share/udhcpc/default.script
+++ b/openwrt/package/base-files/default/usr/share/udhcpc/default.script
@@ -27,9 +27,10 @@ case "$1" in
 
 		if [ -n "$router" ] ; then
 			echo "deleting routers"
-			while route del default gw 0.0.0.0 dev $interface ; do :; done
+			while route del default gw 0.0.0.0 dev $interface >&- 2>&- ; do :; done
 					
 			for i in $router ; do
+				echo "adding router $i"
 				route add default gw $i dev $interface
 			done
 		fi
@@ -37,8 +38,8 @@ case "$1" in
 		echo -n > $RESOLV_CONF
 		${domain:+echo search $domain} >> $RESOLV_CONF
 		for i in $dns ; do
-			echo adding dns $i
-			echo nameserver $i >> $RESOLV_CONF
+			echo "adding dns $i"
+			echo "nameserver $i" >> $RESOLV_CONF
 		done
 		
 		hotplug_event ifup
-- 
2.30.2