X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fsbin%2Ffirstboot;h=4da299189e7da7bb9fe5a9eaf3bc3e11601c40f8;hb=1ac7fd2661ed18ff59380f55927266d8b4828a62;hp=5de4fa8a4b673837fe0ca654c53f965e5f30da4f;hpb=a9929695c6ad0779eaa8cb3d68d37760981d55b7;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index 5de4fa8a4..4da299189 100755
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -12,23 +12,23 @@ for fb_source_file in /lib/firstboot/*; do
     . $fb_source_file
 done
 
+set_mtd_part
+set_rom_part
+set_jffs_part
+
 # invoked as an executable
 if [ "${0##*/}" = "firstboot" ]; then
     if [ "$1" = "switch2jffs" ]; then
 	boot_run_hook switch2jffs
-    elif [ -z "$jffs" ]; then
+    elif [ -n "$jffs" ]; then
 	reset_has_fo=true
 	echo "firstboot has already been run"
 	echo "jffs2 partition is mounted, only resetting files"
 	boot_run_hook jffs2reset
     else
 	mtd erase "$partname"
-	mount "$mtdpart" /jffs -t jffs2
-	fopivot /jffs /rom 1
+	mount "$mtdpart" /overlay -t jffs2
+	fopivot /overlay /rom 1
     fi
-else 
-    set_mtd_part
-    set_rom_part
-    set_jffs_part
 fi