oops... checked in too much stuff. fixing that

[openwrt.git] / target / default / target_skeleton / etc / preinit

diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit
index 28fe805..7a02e31 100755 (executable)
--- a/target/default/target_skeleton/etc/preinit
+++ b/target/default/target_skeleton/etc/preinit
@@ -3,18 +3,10 @@ mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1

-if [ $(cat /proc/sys/reset) = 1 ] ; then
+if [ $(cat /proc/sys/reset) = 1 ] || [ "$(/usr/sbin/nvram get failsafe)" = 1 ]; then

   export FAILSAFE=true
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
   export FAILSAFE=true
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &

-else
-  mount | grep jffs2 1>&- || {
-    mtd unlock mtd4
-    mount -t jffs2 /dev/mtdblock/4 /jffs
-    pivot_root /jffs /jffs/rom
-  }
-  mount none /dev -t devfs
-  mount none /proc -t proc
-  umount rom/proc

 fi
 fi

-mount none /tmp -t ramfs
+/sbin/mount_root ${FAILSAFE:+failsafe}
+

 exec /sbin/init
 exec /sbin/init