Author: rmilecki Date: 2015-04-07 16:14:02 +0200 (Tue, 07 Apr 2015) New Revision: 45291
Modified: trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh Log: bcm53xx: display all errors (not just the 1st one) when checking image Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh 2015-04-07 14:13:56 UTC (rev 45290) +++ trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh 2015-04-07 14:14:02 UTC (rev 45291) @@ -64,6 +64,7 @@ local file_type=$(platform_identify "$1") local magic + local error=0 case "$file_type" in "chk") @@ -75,16 +76,14 @@ [ -n "$dev_board_id" -a "chk $board_id" != "$dev_board_id" ] && { echo "Firmware board_id doesn't match device board_id ($dev_board_id)" - return 1 + error=1 } magic=$(get_magic_long_at "$1" "$header_len") [ "$magic" != "48445230" ] && { echo "No valid TRX firmware in the CHK image" - return 1 + error=1 } - - return 0 ;; "cybertan") local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') @@ -93,25 +92,24 @@ [ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && { echo "Firmware pattern doesn't match device pattern ($dev_pattern)" - return 1 + error=1 } magic=$(get_magic_long_at "$1" 32) [ "$magic" != "48445230" ] && { echo "No valid TRX firmware in the CyberTAN image" - return 1 + error=1 } - - return 0 ;; "trx") - return 0 ;; *) echo "Invalid image type. Please use only .trx files" - return 1 + error=1 ;; esac + + return $error } # Extract TRX and use stadard upgrade method _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
