X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a1c8970a2f8d44b72bb7aaf20db2336ffb6e5dcc..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/base-files/files/lib/functions/boot.sh diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh index 96c1c59db..f93eec99a 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" ] } @@ -42,7 +43,7 @@ dupe() { # { cd $2 find . -xdev -type d - echo "./dev ./jffs ./mnt ./proc ./tmp" + echo "./dev ./overlay ./mnt ./proc ./tmp" # xdev skips mounted directories cd $1 } | xargs mkdir -p @@ -69,7 +70,6 @@ pivot() { # mount -o move $2/dev /dev mount -o move $2/tmp /tmp mount -o move $2/sys /sys 2>&- - mount -o move $2/jffs /jffs 2>&- mount -o move $2/overlay /overlay 2>&- return 0 }