| Message ID | 20201110134558.7905-7-yszhou4tech@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Yousong Zhou |
| Headers | show |
| Series | sysupgrade: reword and organize log lines | expand |
Reviewed-By: Philip Prindeville <philipp@redfish-solutions.com> > On Nov 10, 2020, at 6:45 AM, Yousong Zhou <yszhou4tech@gmail.com> wrote: > > 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@gmail.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" > }
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" }
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@gmail.com> --- package/base-files/files/lib/upgrade/fwtool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)