ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-04-24 13:05:46 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

base-files: allow platform_check_image to prevent --force

Browse Source 
Introduce special handling for return code 74 (EBADMSG) of
platform_check_image which will mark the image as broken and hence
not allow the user to override the check using the --force option.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2025-03-31 00:32:50 +01:00
parent 370a9d5586
commit 5175d0a623
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/base-files/files/sbin/sysupgrade
View File

@ -384,8 +384,9 @@ json_load "$(/usr/libexec/validate_firmware_image "$IMAGE")" || {
exit 1
}
json_get_var valid "valid"
json_get_var forceable "forceable"
[ "$valid" -eq 0 ] && {
if [ $FORCE -eq 1 ]; then
if [ $FORCE -eq 1 ] && [ "$forceable" -eq 1 ]; then
echo "Image check failed but --force given - will update anyway!" >&2
else
echo "Image check failed." >&2

12
package/base-files/files/usr/libexec/validate_firmware_image
View File

@ -56,7 +56,17 @@ json_init
# Call platform_check_image() here so it can add its test
# results and still mark image properly.
json_set_namespace $old_ns
platform_check_image "$1" >&2 || notify_firmware_invalid
platform_check_image "$1" >&2
case "$?" in
0)
;;
74)
notify_firmware_broken
;;
*)
notify_firmware_invalid
;;
esac
json_set_namespace validate_firmware_image old_ns
json_close_object
json_add_boolean valid "$VALID"