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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19980 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index 5de4fa8..e9994de 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
 
     . $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
 # 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"
        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
        mount "$mtdpart" /jffs -t jffs2
        fopivot /jffs /rom 1
     fi

-else 
-    set_mtd_part
-    set_rom_part
-    set_jffs_part

 fi
 
 fi