EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base-files: upgrade: fwtool.sh: use v for log lines

Browse Source 
This will have at least the following effects

 - Log lines will have common prefix
 - They will be output to stderr instead of stdout

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2020-11-03 14:15:35 +08:00
parent 50b870ee3c
commit 856b288d27
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/base-files/files/lib/upgrade/fwtool.sh
View File

@ -10,9 +10,9 @@ fwtool_check_signature() {
} }
if ! fwtool -q -s /tmp/sysupgrade.ucert "$1"; then if ! fwtool -q -s /tmp/sysupgrade.ucert "$1"; then
echo "Image signature not found" v "Image signature not found"
[ "$REQUIRE_IMAGE_SIGNATURE" = 1 -a "$FORCE" != 1 ] && { [ "$REQUIRE_IMAGE_SIGNATURE" = 1 -a "$FORCE" != 1 ] && {
echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware" v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
} }
[ "$REQUIRE_IMAGE_SIGNATURE" = 1 ] && return 1 [ "$REQUIRE_IMAGE_SIGNATURE" = 1 ] && return 1
return 0 return 0
@ -30,16 +30,16 @@ fwtool_check_image() {
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
echo "Image metadata not found" v "Image metadata not found"
[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && { [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware" v "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"
} }
[ "$REQUIRE_IMAGE_METADATA" = 1 ] && return 1 [ "$REQUIRE_IMAGE_METADATA" = 1 ] && return 1
return 0 return 0
fi fi
json_load "$(cat /tmp/sysupgrade.meta)" || { json_load "$(cat /tmp/sysupgrade.meta)" || {
echo "Invalid image metadata" v "Invalid image metadata"
return 1 return 1
} }
@ -64,15 +64,15 @@ fwtool_check_image() {
if [ "$dev" = "$device" ]; then if [ "$dev" = "$device" ]; then
# major compat version -> no sysupgrade # major compat version -> no sysupgrade
if [ "${devicecompat%.*}" != "${imagecompat%.*}" ]; then if [ "${devicecompat%.*}" != "${imagecompat%.*}" ]; then
echo "The device is supported, but this image is incompatible for sysupgrade based on the image version ($devicecompat->$imagecompat)." v "The device is supported, but this image is incompatible for sysupgrade based on the image version ($devicecompat->$imagecompat)."
[ -n "$compatmessage" ] && echo "$compatmessage" [ -n "$compatmessage" ] && v "$compatmessage"
return 1 return 1
fi fi
# minor compat version -> sysupgrade with -n required # minor compat version -> sysupgrade with -n required
if [ "${devicecompat#.*}" != "${imagecompat#.*}" ] && [ "$SAVE_CONFIG" = "1" ]; then if [ "${devicecompat#.*}" != "${imagecompat#.*}" ] && [ "$SAVE_CONFIG" = "1" ]; then
echo "The device is supported, but the config is incompatible to the new image ($devicecompat->$imagecompat). Please upgrade without keeping config (sysupgrade -n)." v "The device is supported, but the config is incompatible to the new image ($devicecompat->$imagecompat). Please upgrade without keeping config (sysupgrade -n)."
[ -n "$compatmessage" ] && echo "$compatmessage" [ -n "$compatmessage" ] && v "$compatmessage"
return 1 return 1
fi fi
@ -80,13 +80,13 @@ fwtool_check_image() {
fi fi
done done
echo "Device $device not supported by this image" v "Device $device not supported by this image"
echo -n "Supported devices:" vn "Supported devices:"
for k in $dev_keys; do for k in $dev_keys; do
json_get_var dev "$k" json_get_var dev "$k"
echo -n " $dev" _vn " $dev"
done done
echo _v
return 1 return 1
} }