clean up the mtd unlocking
SVN-Revision: 7199
This commit is contained in:
parent
d39adea0f7
commit
e4c6078c67
1 changed files with 13 additions and 12 deletions
|
@ -41,18 +41,19 @@ jffs2_ready () {
|
|||
}
|
||||
|
||||
[ failsafe != "$1" ] && {
|
||||
grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
|
||||
mtd unlock rootfs
|
||||
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
||||
. /bin/firstboot
|
||||
jffs2_ready && {
|
||||
echo "switching to jffs2"
|
||||
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
|
||||
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
||||
. /bin/firstboot
|
||||
mtd unlock rootfs_data
|
||||
jffs2_ready && {
|
||||
echo "switching to jffs2"
|
||||
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
|
||||
fopivot /jffs /rom
|
||||
} || {
|
||||
echo "jffs2 not ready yet; using ramdisk"
|
||||
ramoverlay
|
||||
}
|
||||
} || {
|
||||
echo "jffs2 not ready yet; using ramdisk"
|
||||
ramoverlay
|
||||
}
|
||||
} || mount -o remount,rw /dev/root /
|
||||
} || {
|
||||
mtd unlock rootfs
|
||||
mount -o remount,rw /dev/root /
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue