From: Huangbin Zhan <zhanhb88@gmail.com>
Date: Thu, 4 Jun 2020 13:49:54 +0000 (+0800)
Subject: base-files: coreutil-sha256sum breaks status code
X-Git-Tag: v21.02.0-rc1~2409
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fed9bfbfeb84a15c198138a2015d001f82e480d4;p=openwrt%2Fstaging%2Fhauke.git

base-files: coreutil-sha256sum breaks status code

With package "coreutil-sha256sum" installed "sysupgrade" fails to perform 'sha256sum -s' and instead returns 'invalid option -- 's''.
This is caused due to:
	different syntax for a sha256sum status check ('sha256sum --status' with "coreutil-sha256sum")
	'/usr/bin/sha256sum' being symlinked to '/usr/bin/gnu-sha256sum' (after installation of "coreutil-sha256sum")
"coreutil-sha256sum" package from the packages feed replaces the Busybox sha256sum
This patch restores for 'sysupgrade' the busybox call to its sha256sum applet.

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index abd34bdcfb..ca2eb298dc 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -127,7 +127,7 @@ list_changed_conffiles() {
 	list_conffiles | while read file csum; do
 		[ -r "$file" ] || continue
 
-		echo "${csum}  ${file}" | sha256sum -sc - || echo "$file"
+		echo "${csum}  ${file}" | busybox sha256sum -sc - || echo "$file"
 	done
 }