domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: sysupgrade: don't use $ARGV in platform_do_upgrade()

Browse Source 
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 <rafal@milecki.pl>
(cherry picked from commit 8b4bc7abe0)
[rmilecki: dropping ARGV without this change broke sysupgrade]
Fixes: 6ac62c4b6c ("base-files: don't set ARGV and ARGC")
This commit is contained in:
Rafał Miłecki
2019-07-14 19:03:19 +02:00
parent 986c706cd1
commit 5ae87c76b7
15 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
View File

@@ -51,7 +51,7 @@ platform_do_upgrade() {
avm,fritzbox-7530 |\
avm,fritzrepeater-3000 |\
qxwlan,e2600ac-c2)
nand_do_upgrade "$ARGV"
nand_do_upgrade "$1"
;;
asus,map-ac2200)
CI_KERNPART="linux"
@@ -64,7 +64,7 @@ platform_do_upgrade() {
;;
linksys,ea6350v3 |\
linksys,ea8300)
platform_do_upgrade_linksys "$ARGV"
platform_do_upgrade_linksys "$1"
;;
meraki,mr33)
CI_KERNPART="part.safe"
@@ -73,13 +73,13 @@ platform_do_upgrade() {
openmesh,a42 |\
openmesh,a62)
PART_NAME="inactive"
platform_do_upgrade_openmesh "$ARGV"
platform_do_upgrade_openmesh "$1"
;;
zyxel,nbg6617)
zyxel_do_upgrade "$1"
;;
*)
default_do_upgrade "$ARGV"
default_do_upgrade "$1"
;;
esac
}