summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-21 05:03:21 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-21 05:03:21 +0000
commitf8d2c2cd6541ae6269deb4fed44fa7f712149d46 (patch)
tree213c008e8ff60b513b842a967dd55938831c0a11
parent2be339c9429a1719b4eab45785f591487f955238 (diff)
deal with jffs2 transition
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@278 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/default/target_skeleton/etc/preinit16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit
index 95a2da8be..d2036f4e5 100755
--- a/target/default/target_skeleton/etc/preinit
+++ b/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,14 @@ 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
+ 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
mount none /tmp -t ramfs
exec /sbin/init