diff options
Diffstat (limited to 'package/base-files/files')
| -rw-r--r-- | package/base-files/files/lib/upgrade/nand.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index 67c6a620b1..c7ec59cb22 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -236,11 +236,6 @@ nand_upgrade_ubinized() { local ubi_file="$1" local mtdnum="$(find_mtd_index "$CI_UBIPART")" - [ ! "$mtdnum" ] && { - CI_UBIPART="rootfs" - mtdnum="$(find_mtd_index "$CI_UBIPART")" - } - if [ ! "$mtdnum" ]; then echo "cannot find mtd device $CI_UBIPART" umount -a @@ -248,10 +243,11 @@ nand_upgrade_ubinized() { fi local mtddev="/dev/mtd${mtdnum}" - ubidetach -p "${mtddev}" || true + ubidetach -p "${mtddev}" || : sync ubiformat "${mtddev}" -y -f "${ubi_file}" ubiattach -p "${mtddev}" + nand_do_upgrade_success } @@ -333,7 +329,7 @@ nand_upgrade_tar() { nand_do_upgrade() { local file_type=$(identify $1) - [ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs" + [ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART=rootfs case "$file_type" in "fit") nand_upgrade_fit $1;; |