X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fbin%2Ffirstboot;h=8453b300966902a2832e23eb8d396c5a0776bd53;hb=796a9d1091884a07817e5c140d0ff6a0b8c76235;hp=ef2ba5733bb4da6217d97d1a1658104e291e900f;hpb=312e4176e0e4616589d6244f0b604272a0ccb9cb;p=openwrt.git

diff --git a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
index ef2ba5733b..8453b30096 100755
--- a/package/base-files/files/bin/firstboot
+++ b/package/base-files/files/bin/firstboot
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: firstboot 5544 2006-11-17 03:07:10Z nbd $
 . /etc/functions.sh
 
 partname="rootfs_data"
@@ -25,7 +24,7 @@ dupe() { # <new_root> <old_root>
 		case "$file" in
 		./rom/note) ;; #nothing
 		./etc/config*|\
-		./usr/lib/ipkg/info/*) cp -af $2/$file $file;;
+		./usr/lib/opkg/info/*) cp -af $2/$file $file;;
 		*) ln -sf /rom/${file#./*} $file;;
 		esac
 	done
@@ -49,7 +48,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 +78,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 +101,6 @@ ramoverlay() {
 		# this will almost always fail
 		umount /tmp/root 2>&-
 
-		# fs is clean
-		jffs2root --clean
 		exit 0
 	}