From f8f24da4dfb296c6a4fd16a037442883988200f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 17 Apr 2015 06:03:00 +0000 Subject: [PATCH] bcm53xx: fix handling absolute paths in sysupgrade (for vendor formats) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45473 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/bcm53xx/base-files/lib/upgrade/platform.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index 034fb8e6b8..eb6906aaec 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -133,8 +133,8 @@ platform_pre_upgrade() { # Extract trx case "$file_type" in - "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";; - "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";; + "chk") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_chk "$1" "$trx";; + "cybertan") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_cybertan "$1" "$trx";; esac # Extract partitions from trx @@ -178,8 +178,8 @@ platform_do_upgrade() { } case "$file_type" in - "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";; - "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";; + "chk") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_chk "$1" "$trx";; + "cybertan") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_cybertan "$1" "$trx";; esac shift