tweaks for 2M devices

SVN-Revision: 7179

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"

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"