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/mvebu/base-files/lib/upgrade/platform.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/mvebu/base-files') diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 744ed4f132..981fa2aa2e 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -22,14 +22,14 @@ platform_check_image() { platform_do_upgrade() { case "$(board_name)" in linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) - platform_do_upgrade_linksys "$ARGV" + platform_do_upgrade_linksys "$1" ;; cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\ marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1) - platform_do_upgrade_sdcard "$ARGV" + platform_do_upgrade_sdcard "$1" ;; *) - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; esac } -- cgit v1.2.3