[openwrt/openwrt] base-files: upgrade: fwtool.sh: rewording logs

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 11 10:47:06 EST 2020


yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/128bb4e8d31d358ce7c504bc8554abe45a6f9611

commit 128bb4e8d31d358ce7c504bc8554abe45a6f9611
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Tue Nov 3 16:22:58 2020 +0800

    base-files: upgrade: fwtool.sh: rewording logs
    
    The intent is to make it sound more like info level message, not some
    error like "404 not found".  x86 target at the moment makes image with
    only signature but no metadata (ref commit f8141216 "x86: append
    metadata to combined images").
    
    Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
    Reviewed-By: Philip Prindeville <philipp at redfish-solutions.com>
---
 package/base-files/files/lib/upgrade/fwtool.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index bf3059dbce..3826bf5c30 100644
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -10,7 +10,7 @@ fwtool_check_signature() {
 	}
 
 	if ! fwtool -q -s /tmp/sysupgrade.ucert "$1"; then
-		v "Image signature not found"
+		v "Image signature not present"
 		[ "$REQUIRE_IMAGE_SIGNATURE" = 1 -a "$FORCE" != 1 ] && {
 			v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
 		}
@@ -30,7 +30,7 @@ fwtool_check_image() {
 	. /usr/share/libubox/jshn.sh
 
 	if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
-		v "Image metadata not found"
+		v "Image metadata not present"
 		[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
 			v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
 		}



More information about the lede-commits mailing list