aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib
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
commitd6a142375bd332ca71296d3d8ad94afd0cf996bc (patch)
tree95427387d454c7bb5154f9785f4cf8f2f100aa17 /package/base-files/files/lib
parentf7d97234e23cb31940cfe5690ca8a4f32cbe08b6 (diff)
downloadupstream-d6a142375bd332ca71296d3d8ad94afd0cf996bc.tar.gz
upstream-d6a142375bd332ca71296d3d8ad94afd0cf996bc.tar.bz2
upstream-d6a142375bd332ca71296d3d8ad94afd0cf996bc.zip
base-files: fix a preinit hang in jffs2_ready() when no rootfs_data partition is found (#7362)
SVN-Revision: 21511
Diffstat (limited to 'package/base-files/files/lib')
-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" ]
}