aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/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
commit1dbc3b98052d08678da1ace87e135ce20603999a (patch)
treed3456f9b3922130e186125b6c1e3ad70e37f36f9 /package/base-files/files
parente4d03e7d306970a9dbac2257bfc7dc9f7e8cc45f (diff)
downloadupstream-1dbc3b98052d08678da1ace87e135ce20603999a.tar.gz
upstream-1dbc3b98052d08678da1ace87e135ce20603999a.tar.bz2
upstream-1dbc3b98052d08678da1ace87e135ce20603999a.zip
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
Diffstat (limited to 'package/base-files/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