[backfire] merge r21511 - fix a preinit hang in jffs2_ready() when no rootfs_data...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21582 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index e6f6633adb94123c45e45a652ed753f650e57e89..f93eec99a9f126fb53c890c34c619f4e5fb76243 100644 (file)
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -32,6 +32,7 @@ find_mtd_part() {
 
 jffs2_ready () {
     mtdpart="$(find_mtd_part rootfs_data)"
+    [ -z "$mtdpart" ] && return 1
     magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
     [ "$magic" != "deadc0de" ]
 }