summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-08 21:11:49 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-08 21:11:49 +0000
commit89ca788b2d7c218c98dd112c567e4bf2d92c4864 (patch)
tree08c1a3c0782cac924079e399290e61d450510938
parentfdfccc7699b38ab893a8cd6fcf8d5030b71007f3 (diff)
fix a bug that prevents the wgt634u from initializing the filesystem properly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3601 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/bin/firstboot2
-rwxr-xr-xpackage/base-files/default/sbin/mount_root8
2 files changed, 8 insertions, 2 deletions
diff --git a/package/base-files/default/bin/firstboot b/package/base-files/default/bin/firstboot
index 1d9b658b6..5d3d9677e 100755
--- a/package/base-files/default/bin/firstboot
+++ b/package/base-files/default/bin/firstboot
@@ -37,6 +37,8 @@ pivot() { # <new_root> <old_root>
pivot_root $1 $1$2 && {
mount -o move $2/dev /dev
mount -o move $2/tmp /tmp
+ mount -o move $2/sys /sys
+ return 0
}
}
diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index 38252e83f..88a836c80 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -22,9 +22,13 @@ if [ "$1" != "failsafe" ]; then
. /bin/firstboot
is_dirty
[ $? != 0 ] && {
- mount /dev/mtdblock/4 /jffs
+ echo "switching to jffs2"
+ mount /dev/mtdblock/4 /jffs -t jffs2
pivot /jffs /rom
- } || ramoverlay
+ } || {
+ echo "jffs2 unusable; using ramdisk"
+ ramoverlay
+ }
fi
fi