tweaks for 2M devices

SVN-Revision: 7179

diff --git a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
index 267e6732d96a716508d620d14fdce89e9b79558d..5c11623b488957a96ca22cce4279e32824871aa2 100755 (executable)
--- a/package/base-files/files/bin/firstboot
+++ b/package/base-files/files/bin/firstboot
@@ -79,11 +79,12 @@ ramoverlay() {
        }
 
        [ "$1" = "switch2jffs" ] && {
+               mount "$mtdpart" /rom/jffs -t jffs2 || exit
+
                # try to avoid fs changing while copying
                mount -o remount,ro none / 2>&-
 
                # copy ramoverlay to jffs2
-               mount "$mtdpart" /rom/jffs -t jffs2
                echo -n "copying files ... "
                cp -a /tmp/root/* /rom/jffs 2>&-
                echo "done"

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 1aa7db7255bbbea4129490c18056c454ddc94cdf..2006f0128e86d4aa4e8c133df3637dbedc7f4ef6 100755 (executable)
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -47,7 +47,7 @@ jffs2_ready () {
                        . /bin/firstboot
                        jffs2_ready && {
                                echo "switching to jffs2"
-                               mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
+                               mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
                                fopivot /jffs /rom
                        } || {
                                echo "jffs2 not ready yet; using ramdisk"