load diag from preinit to signal the resetmon check

remove "mtd unlock" -- doesn't appear to be needed ?

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/root/etc/init.d/S10boot b/root/etc/init.d/S10boot
index 6a8cc6c..437bd7e 100755 (executable)
--- a/root/etc/init.d/S10boot
+++ b/root/etc/init.d/S10boot
@@ -1,8 +1,6 @@
 #!/bin/sh
 sysctl -p
-
-insmod diag
-echo "0x01" > /proc/sys/diag
+echo "S" > /proc/jffs2_bbc
 
 # networking stub
 insmod et

diff --git a/root/etc/preinit b/root/etc/preinit
index f9bfd44..f37c02b 100755 (executable)
--- a/root/etc/preinit
+++ b/root/etc/preinit
@@ -1,6 +1,7 @@
 #!/bin/sh
 mount none /proc -t proc
-mtd unlock mtd4
+insmod diag
+echo 0x01 > /proc/sys/diag
 sleep 1
 if /sbin/resetmon ; then
   mount -t jffs2 /dev/mtdblock/4 /jffs
@@ -10,8 +11,7 @@ if /sbin/resetmon ; then
   umount rom/proc
   umount rom/dev
 else
-  FAILSAFE=true
-  export FAILSAFE
+  export FAILSAFE=true
 fi
 mount none /tmp -t ramfs
 exec /sbin/init