X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/312e4176e0e4616589d6244f0b604272a0ccb9cb..7431c1813f50563ae066c8b3a683aee3725d3ca9:/package/base-files/files/bin/firstboot?ds=sidebyside

diff --git a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
index ef2ba5733..ad87f7482 100755
--- a/package/base-files/files/bin/firstboot
+++ b/package/base-files/files/bin/firstboot
@@ -49,7 +49,7 @@ pivot() { # <new_root> <old_root>
 fopivot() { # <rw_root> <ro_root> <dupe?>
 	root=$1
 	{
-		mount -t mini_fo -o base=/,sto=$1 $1 /mnt 2>&- && root=/mnt
+		mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
 	} || {
 		[ "$3" = "1" ] && {
 		mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
@@ -79,13 +79,12 @@ ramoverlay() {
 	}
 
 	[ "$1" = "switch2jffs" ] && {
-		mtd erase "$partname"
+		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"
@@ -103,8 +102,6 @@ ramoverlay() {
 		# this will almost always fail
 		umount /tmp/root 2>&-
 
-		# fs is clean
-		jffs2root --clean
 		exit 0
 	}