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/ar71xx/base-files/lib/upgrade/dir825.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ar71xx/base-files/lib/upgrade/dir825.sh') diff --git a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh index 58a011448b..eac0aef1b8 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh @@ -148,7 +148,7 @@ platform_do_upgrade_dir825b() { else PART_NAME="firmware" fi - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; "43493030") if [ -z "$fw_mtd" ]; then @@ -159,7 +159,7 @@ platform_do_upgrade_dir825b() { exit 1 } fi - dir825b_do_upgrade_combined "firmware" "$ARGV" + dir825b_do_upgrade_combined "firmware" "$1" ;; esac } -- cgit v1.2.3