aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-09-30 11:36:37 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-09-30 11:36:37 +0000
commit223e7a327896f37526b3bcfbb7aa9ce490aabd93 (patch)
treeedfadd4fab9f64d42ad7b53db42ecba44152a70d
parent968d6e26afc25b5f4ad17653fc5b93c8f29ae903 (diff)
downloadupstream-223e7a327896f37526b3bcfbb7aa9ce490aabd93.tar.gz
upstream-223e7a327896f37526b3bcfbb7aa9ce490aabd93.tar.bz2
upstream-223e7a327896f37526b3bcfbb7aa9ce490aabd93.zip
check if some /proc files exist, before using it, for systems without diag kernel modul
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2008 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/etc/init.d/S99done2
-rwxr-xr-xpackage/base-files/default/etc/preinit4
-rwxr-xr-xpackage/base-files/default/sbin/mount_root2
3 files changed, 4 insertions, 4 deletions
diff --git a/package/base-files/default/etc/init.d/S99done b/package/base-files/default/etc/init.d/S99done
index ce60337212..a260ac3d6f 100755
--- a/package/base-files/default/etc/init.d/S99done
+++ b/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/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index ff9bb4b10a..d64fdaa513 100755
--- a/package/base-files/default/etc/preinit
+++ b/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/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index ae78ee4881..32a6ee548f 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/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