bcm53xx: fallback to default_do_upgrade if NAND upgrade fails

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45915 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 25d22d9..131f6dd 100644 (file)
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -130,6 +130,10 @@ platform_pre_upgrade() {
                ${offset:+-o $offset} \
                -1 $dir/kernel \
                -2 $dir/root
+       [ $? -ne 0 ] && {
+               echo "Failed to extract TRX partitions."
+               return
+       }
 
        # Firmwares without UBI image should be flashed "normally"
        local root_type=$(identify $dir/root)
@@ -156,6 +160,10 @@ platform_pre_upgrade() {
        otrx create /tmp/kernel.trx \
                -f $dir/kernel -b $(($linux_length + 28)) \
                -f /tmp/null.bin
+       [ $? -ne 0 ] && {
+               echo "Failed to create simple TRX with new kernel."
+               return
+       }
 
        # Prepare UBI image (drop unwanted extra blocks)
        local ubi_length=0
@@ -163,6 +171,10 @@ platform_pre_upgrade() {
                ubi_length=$(($ubi_length + 131072))
        done
        dd if=$dir/root of=/tmp/root.ubi bs=131072 count=$((ubi_length / 131072)) 2>/dev/null
+       [ $? -ne 0 ] && {
+               echo "Failed to prepare new UBI image."
+               return
+       }
 
        # Flash
        mtd write /tmp/kernel.trx firmware