KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 19980
This commit is contained in:
Nicolas Thill 2010-03-05 00:53:51 +00:00
parent da72558c32
commit 71886caf3f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/base-files/files/sbin/firstboot
View file

@ -12,11 +12,15 @@ for fb_source_file in /lib/firstboot/*; do
. $fb_source_file . $fb_source_file
done done
set_mtd_part
set_rom_part
set_jffs_part
# invoked as an executable # invoked as an executable
if [ "${0##*/}" = "firstboot" ]; then if [ "${0##*/}" = "firstboot" ]; then
if [ "$1" = "switch2jffs" ]; then if [ "$1" = "switch2jffs" ]; then
boot_run_hook switch2jffs boot_run_hook switch2jffs
elif [ -z "$jffs" ]; then elif [ -n "$jffs" ]; then
reset_has_fo=true reset_has_fo=true
echo "firstboot has already been run" echo "firstboot has already been run"
echo "jffs2 partition is mounted, only resetting files" echo "jffs2 partition is mounted, only resetting files"
@ -26,9 +30,5 @@ if [ "${0##*/}" = "firstboot" ]; then
mount "$mtdpart" /jffs -t jffs2 mount "$mtdpart" /jffs -t jffs2
fopivot /jffs /rom 1 fopivot /jffs /rom 1
fi fi
else
set_mtd_part
set_rom_part
set_jffs_part
fi fi