clean up the mtd unlocking

SVN-Revision: 7199
lede-17.01
Mike Baker 2007-05-13 09:39:21 +00:00
parent d39adea0f7
commit e4c6078c67
1 changed files with 13 additions and 12 deletions

View File

@ -41,18 +41,19 @@ jffs2_ready () {
} }
[ failsafe != "$1" ] && { [ failsafe != "$1" ] && {
grep rootfs /proc/mtd >/dev/null 2>/dev/null && { grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
mtd unlock rootfs . /bin/firstboot
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && { mtd unlock rootfs_data
. /bin/firstboot jffs2_ready && {
jffs2_ready && { echo "switching to jffs2"
echo "switching to jffs2" mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
fopivot /jffs /rom fopivot /jffs /rom
} || { } || {
echo "jffs2 not ready yet; using ramdisk" echo "jffs2 not ready yet; using ramdisk"
ramoverlay ramoverlay
}
} }
} || mount -o remount,rw /dev/root / } || {
mtd unlock rootfs
mount -o remount,rw /dev/root /
}
} }