aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-20 05:57:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-20 05:57:54 +0000
commitf82715bdd9bbfee21a3ebe3f92b5e3e36a3ecc5a (patch)
treec38aabf6d5560ebf0abb97ebc34b8b607554c80e /package/base-files/files
parent4ec94ac262098a871c0bedc40799153217722f38 (diff)
downloadupstream-f82715bdd9bbfee21a3ebe3f92b5e3e36a3ecc5a.tar.gz
upstream-f82715bdd9bbfee21a3ebe3f92b5e3e36a3ecc5a.tar.bz2
upstream-f82715bdd9bbfee21a3ebe3f92b5e3e36a3ecc5a.zip
[package] base-files: fix a preinit hang in jffs2_ready() when no rootfs_data partition is found (#7362)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files')
-rw-r--r--package/base-files/files/lib/functions/boot.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index e6f6633adb..f93eec99a9 100644
--- 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" ]
}