X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6fa165042b07cbb6ff52d2439e79d8ffe17be4ab..0be9a62a40a0ffce58d0800cfd530ab88f1d8c62:/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 6e6a9c998..01df20583 100755
--- a/openwrt/target/default/target_skeleton/etc/preinit
+++ b/openwrt/target/default/target_skeleton/etc/preinit
@@ -1,6 +1,4 @@
 #!/bin/sh
-# executed from squashfs before init to 
-# transfer root to the jffs2 partition
 mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag
@@ -9,12 +7,17 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then
   export FAILSAFE=true
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 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 rom/dev
+  mount | grep jffs2 >&-
+  if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then
+    jffs2root --move && reboot 
+  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 rom/dev
+  fi
 fi
 mount none /tmp -t ramfs
 exec /sbin/init