From 5ae87c76b7fb2fb6e3c5ac5f4219ea652def092a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 14 Jul 2019 19:03:19 +0200 Subject: treewide: sysupgrade: don't use $ARGV in platform_do_upgrade() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit stage2 passes image path to platform_do_upgrade() as an argument so it can be simply accessed using $1 Signed-off-by: Rafał Miłecki (cherry picked from commit 8b4bc7abe073489a3595eeb2d81818852319c148) [rmilecki: dropping ARGV without this change broke sysupgrade] Fixes: 6ac62c4b6cae ("base-files: don't set ARGV and ARGC") --- target/linux/ramips/base-files/lib/upgrade/platform.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/ramips/base-files') diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 7372a37939..c4a09cb40e 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -27,7 +27,7 @@ platform_nand_pre_upgrade() { case "$board" in ubnt-erx|\ ubnt-erx-sfp) - platform_upgrade_ubnt_erx "$ARGV" + platform_upgrade_ubnt_erx "$1" ;; esac } @@ -43,14 +43,14 @@ platform_do_upgrade() { ubnt-erx-sfp|\ xiaomi,mir3g|\ xiaomi,mir3p) - nand_do_upgrade "$ARGV" + nand_do_upgrade "$1" ;; tplink,c50-v4) MTD_ARGS="-t romfile" - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; *) - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; esac } -- cgit v1.2.3