aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-03-05 00:53:51 +0000
committerNicolas Thill <nico@openwrt.org>2010-03-05 00:53:51 +0000
commit71886caf3f6d961273efa7eb2c89b79b81c8c962 (patch)
tree1e1eda212bee68b1095fa70e4be7237b216b05c4 /package/base-files
parentda72558c327b1b39a7a17b7d96aed1f401c2fc53 (diff)
downloadupstream-71886caf3f6d961273efa7eb2c89b79b81c8c962.tar.gz
upstream-71886caf3f6d961273efa7eb2c89b79b81c8c962.tar.bz2
upstream-71886caf3f6d961273efa7eb2c89b79b81c8c962.zip
firstboot: detect mtd, rom & jffs parts first, fix jffs mounted test
SVN-Revision: 19980
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/sbin/firstboot10
1 files changed, 5 insertions, 5 deletions
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