[openwrt/openwrt] base-files: coreutil-sha256sum breaks status code
LEDE Commits
lede-commits at lists.infradead.org
Fri Jun 26 18:19:26 EDT 2020
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fed9bfbfeb84a15c198138a2015d001f82e480d4
commit fed9bfbfeb84a15c198138a2015d001f82e480d4
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Thu Jun 4 21:49:54 2020 +0800
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 at gmail.com>
---
package/base-files/files/sbin/sysupgrade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
}
More information about the lede-commits
mailing list