X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a9929695c6ad0779eaa8cb3d68d37760981d55b7..2d17b93d5618cc37b3e1a4eafbb62a95a17c339f:/package/base-files/files/sbin/firstboot

diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index 5de4fa8a4..e9994dec3 100755
--- 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