summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-04 14:35:13 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-04 14:35:13 +0000
commit85fc1939a91db8e868cc5d10fc04216210ac62b8 (patch)
treeb475e321acf6972f28452b66688bd4a283816efc
parent6364d7fe22964d0c113264560e6aa625fe8d0d5d (diff)
add oleg's fix for jffs2 mounting
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@799 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xopenwrt/target/default/target_skeleton/sbin/mount_root9
1 files changed, 5 insertions, 4 deletions
diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index 5aec06212..7a8184745 100755
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/target/default/target_skeleton/sbin/mount_root
@@ -2,14 +2,15 @@
if [ "$1" != "failsafe" ]; then
mount | grep jffs2 >&-
if [ $? = 0 ] ; then
- [ $(cat /proc/mtd | wc -l) = 6 ] && {
+ if [ $(cat /proc/mtd | wc -l) = 6 ]; then
echo 5 > /proc/sys/diag
mtd unlock linux
mtd erase OpenWrt
jffs2root --move
- } &
- mtd unlock rootfs
- mount -o remount,rw /dev/root /
+ else
+ mtd unlock rootfs
+ mount -o remount,rw /dev/root /
+ fi
else
mtd unlock OpenWrt
mount -t jffs2 /dev/mtdblock/4 /jffs