From: Rafał Miłecki Date: Sun, 14 Jul 2019 16:59:59 +0000 (+0200) Subject: mvebu: sysupgrade: don't use $ARGV in platform_check_image() X-Git-Tag: v19.07.0-rc1~145 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15292501a1a9ca979b7b92d5187a7b095fe3af66;p=oweals%2Fopenwrt.git mvebu: sysupgrade: don't use $ARGV in platform_check_image() sysupgrade passes image path to platform_check_image() as an argument so it can be simply accessed using $1 Signed-off-by: Rafał Miłecki (cherry picked from commit 76e43c82b55518b794ac24f9acfb3888c638f99b) [rmilecki: dropping ARGV without this change broke sysupgrade] Fixes: 6ac62c4b6cae ("base-files: don't set ARGV and ARGC") --- diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 981fa2aa2e..58e7d83e4e 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -11,7 +11,7 @@ platform_check_image() { case "$(board_name)" in 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_check_image_sdcard "$ARGV" + platform_check_image_sdcard "$1" ;; *) return 0