diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-07-14 19:03:19 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-07 14:31:16 +0200 |
| commit | 5ae87c76b7fb2fb6e3c5ac5f4219ea652def092a (patch) | |
| tree | e5d365054d793e5681f8f60c7db3027a6928a6c5 /target/linux/ar71xx/base-files/lib | |
| parent | 986c706cd1e67974d59fa73de6f0e1d1ea1e4830 (diff) | |
| download | upstream-5ae87c76b7fb2fb6e3c5ac5f4219ea652def092a.tar.gz upstream-5ae87c76b7fb2fb6e3c5ac5f4219ea652def092a.tar.bz2 upstream-5ae87c76b7fb2fb6e3c5ac5f4219ea652def092a.zip | |
treewide: sysupgrade: don't use $ARGV in platform_do_upgrade()
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 8b4bc7abe073489a3595eeb2d81818852319c148)
[rmilecki: dropping ARGV without this change broke sysupgrade]
Fixes: 6ac62c4b6cae ("base-files: don't set ARGV and ARGC")
Diffstat (limited to 'target/linux/ar71xx/base-files/lib')
| -rw-r--r-- | target/linux/ar71xx/base-files/lib/upgrade/dir825.sh | 4 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 18 |
2 files changed, 11 insertions, 11 deletions
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 } diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 49d9bab959..af0c1b2473 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -810,7 +810,7 @@ platform_do_upgrade() { case "$board" in all0258n) - platform_do_upgrade_allnet "0x9f050000" "$ARGV" + platform_do_upgrade_allnet "0x9f050000" "$1" ;; all0305|\ eap7660d|\ @@ -822,19 +822,19 @@ platform_do_upgrade() { pb44|\ routerstation|\ routerstation-pro) - platform_do_upgrade_combined "$ARGV" + platform_do_upgrade_combined "$1" ;; all0315n) - platform_do_upgrade_allnet "0x9f080000" "$ARGV" + platform_do_upgrade_allnet "0x9f080000" "$1" ;; cap4200ag|\ eap300v2|\ ens202ext) - platform_do_upgrade_allnet "0xbf0a0000" "$ARGV" + platform_do_upgrade_allnet "0xbf0a0000" "$1" ;; dir-825-b1|\ tew-673gru) - platform_do_upgrade_dir825b "$ARGV" + platform_do_upgrade_dir825b "$1" ;; a40|\ a60|\ @@ -856,7 +856,7 @@ platform_do_upgrade() { om5p-ac|\ om5p-acv2|\ om5p-an) - platform_do_upgrade_openmesh "$ARGV" + platform_do_upgrade_openmesh "$1" ;; c-60|\ hiveap-121|\ @@ -907,14 +907,14 @@ platform_do_upgrade() { uap-pro|\ unifi-outdoor-plus) MTD_CONFIG_ARGS="-s 0x180000" - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; wp543|\ wpe72) - platform_do_upgrade_compex "$ARGV" + platform_do_upgrade_compex "$1" ;; *) - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; esac } |