From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 30 Sep 2005 11:36:37 +0000 (+0000)
Subject: check if some /proc files exist, before using it, for systems without diag kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c3d659134c0d8626bce2daaa66a45efb34abbfc4;p=openwrt%2Fsvn-archive%2Farchive.git

check if some /proc files exist, before using it, for systems without diag kernel modul


SVN-Revision: 2008
---

diff --git a/openwrt/package/base-files/default/etc/init.d/S99done b/openwrt/package/base-files/default/etc/init.d/S99done
index ce60337212..a260ac3d6f 100755
--- a/openwrt/package/base-files/default/etc/init.d/S99done
+++ b/openwrt/package/base-files/default/etc/init.d/S99done
@@ -1,4 +1,4 @@
 #!/bin/sh
 # set leds to normal state
-echo "0x00" > /proc/sys/diag
+[ -f /proc/sys/diag ] && echo "0x00" > /proc/sys/diag
 sysctl -p >&-
diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index ff9bb4b10a..d64fdaa513 100755
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -3,9 +3,9 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
-echo 0x01 > /proc/sys/diag
+[ -f /proc/sys/diag ] && echo 0x01 > /proc/sys/diag
 sleep 1
-if [ ! -f /proc/sys/reset ] || [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
+if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
 	[ "$(nvram get boot_wait)" != "on" ] && {
 		nvram set boot_wait=on
diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index ae78ee4881..32a6ee548f 100755
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -4,7 +4,7 @@ if [ "$1" != "failsafe" ]; then
 	mount | grep jffs2 >&-
 	if [ $? = 0 ] ; then
 		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-			echo 5 > /proc/sys/diag
+			[ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag
 			mtd unlock linux
 			mtd erase OpenWrt
 			jffs2root --move