base-files: clean up ubinized sysupgrade code

Remove redundant check from nand ubinized sysupgrade code. This check
has already been done in the only caller of the affected function:
nand_do_upgrade.

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>

diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 67c6a620b1f4781feb92bab7f6b61c170f8e8ab0..c7ec59cb22cc8263590642e3d9a6b2e3a7b89a97 100644 (file)
--- 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;;