From 6ac62c4b6cae9f92d8d631ad1aca3b822e24901a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 14 Jul 2019 19:00:00 +0200 Subject: [PATCH] base-files: don't set ARGV and ARGC MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Those are not used by any image check function anymore. Signed-off-by: Rafał Miłecki (cherry picked from commit 3f4c785a6bbde87296e362c315f10b55c98843e3) --- package/base-files/Makefile | 2 +- package/base-files/files/lib/upgrade/stage2 | 3 --- package/base-files/files/sbin/sysupgrade | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 44aef87a20..7c63d3ef44 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=203 +PKG_RELEASE:=204 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 0a11cb2005..fef121f37c 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -6,9 +6,6 @@ export IMAGE="$1" COMMAND="$2" -export ARGV="$IMAGE" -export ARGC=1 - export SAVE_CONFIG=1 export SAVE_PARTITIONS=1 diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 73291262e7..001e644476 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -316,9 +316,6 @@ case "$IMAGE" in ;; esac -export ARGV="$IMAGE" -export ARGC=1 - for check in $sysupgrade_image_check; do ( $check "$IMAGE" ) || { if [ $FORCE -eq 1 ]; then -- 2.30.2