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/ipq806x/base-files/lib/upgrade | |
| 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/ipq806x/base-files/lib/upgrade')
| -rw-r--r-- | target/linux/ipq806x/base-files/lib/upgrade/platform.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh index 2f0190629e..5919613cb9 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh @@ -13,7 +13,7 @@ platform_do_upgrade() { buffalo,wxr-2533dhp) buffalo_upgrade_prepare_ubi CI_ROOTPART="ubi_rootfs" - nand_do_upgrade "$ARGV" + nand_do_upgrade "$1" ;; compex,wpq864|\ netgear,d7800 |\ @@ -23,24 +23,24 @@ platform_do_upgrade() { qcom,ipq8064-ap148 |\ qcom,ipq8064-ap161 |\ zyxel,nbg6817) - nand_do_upgrade "$ARGV" + nand_do_upgrade "$1" ;; linksys,ea8500) - platform_do_upgrade_linksys "$ARGV" + platform_do_upgrade_linksys "$1" ;; tplink,c2600) PART_NAME="os-image:rootfs" MTD_CONFIG_ARGS="-s 0x200000" - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; tplink,vr2600v) PART_NAME="kernel:rootfs" MTD_CONFIG_ARGS="-s 0x200000" - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; nec,wg2600hp |\ *) - default_do_upgrade "$ARGV" + default_do_upgrade "$1" ;; esac } |