projects
/
openwrt
/
staging
/
nbd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d9e7342
)
add oleg's fix for jffs2 mounting
author
Felix Fietkau
<nbd@openwrt.org>
Wed, 4 May 2005 14:35:13 +0000
(14:35 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Wed, 4 May 2005 14:35:13 +0000
(14:35 +0000)
SVN-Revision: 799
openwrt/target/default/target_skeleton/sbin/mount_root
patch
|
blob
|
history
diff --git
a/openwrt/target/default/target_skeleton/sbin/mount_root
b/openwrt/target/default/target_skeleton/sbin/mount_root
index 5aec062125fad09bd0fb8a4060651ab87d5f936c..7a8184745ddcfa3b8f176941693159f7405dc0d4 100755
(executable)
--- 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