Allow use of the offline_root option

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

diff --git a/openwrt/target/default/target_skeleton/etc/preinit b/openwrt/target/default/target_skeleton/etc/preinit
index 30c025b..c6ad0d7 100755 (executable)
--- a/openwrt/target/default/target_skeleton/etc/preinit
+++ b/openwrt/target/default/target_skeleton/etc/preinit
@@ -1,6 +1,5 @@
 #!/bin/sh
 mount none /proc -t proc
 #!/bin/sh
 mount none /proc -t proc

-mount none /tmp -t ramfs

 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1


@@ -9,15 +8,25 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 else
   mount | grep jffs2 >&-
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 else
   mount | grep jffs2 >&-

-  if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then
-    jffs2root --move && reboot 
+  if [ $? = 0 ] ; then
+    mtd unlock rootfs
+    [ $(cat /proc/mtd | wc -l) = 6 ] && {
+      echo 5 > /proc/sys/diag
+      mtd unlock OpenWrt
+      mtd erase OpenWrt
+      jffs2root --move
+    }
+    mount -o remount,rw /dev/root /

   else
     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
   else
     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
+    umount rom/proc rom/dev

   fi
 fi
   fi
 fi

+mount none /tmp -t ramfs
+mkdir -p /dev/pts
+mount none /dev/pts -t devpts

 exec /sbin/init
 exec /sbin/init