firstboot: detect mtd, rom & jffs parts first, fix jffs mounted test

SVN-Revision: 19980

diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index 5de4fa8a4b673837fe0ca654c53f965e5f30da4f..e9994dec3856eada1d742f946d5a9b77ba84c4d3 100755 (executable)
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -12,11 +12,15 @@ 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"
@@ -26,9 +30,5 @@ if [ "${0##*/}" = "firstboot" ]; then
        mount "$mtdpart" /jffs -t jffs2
        fopivot /jffs /rom 1
     fi
-else 
-    set_mtd_part
-    set_rom_part
-    set_jffs_part
 fi