From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 5 Mar 2010 00:53:51 +0000 (+0000)
Subject: firstboot: detect mtd, rom & jffs parts first, fix jffs mounted test
X-Git-Tag: reboot~20831
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=71886caf3f6d961273efa7eb2c89b79b81c8c962;p=oweals%2Fopenwrt.git

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 5de4fa8a4b..e9994dec38 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