From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 21 Jan 2026 14:35:39 +0000 (+0100)
Subject: sysupdate-resource: on hash mismatch the best before marker is not ignored
X-Git-Tag: v260-rc1~339^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=382382a6eb990babb264ff89715b0e46f0924a4b;p=thirdparty%2Fsystemd.git

sysupdate-resource: on hash mismatch the best before marker is not ignored

Hence use a less ambiguous wording.

Follow-up for d0badc0a619e15c67d38f65730ac210316ece84c
Addresses https://github.com/systemd/systemd/pull/40393#discussion_r2709953179
---

diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index bd116315391..c9e69812613 100644
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -382,7 +382,7 @@ static int process_magic_file(
          * so that people fix it. After all we want to retain liberty to maybe one day place some useful data
          * inside it */
         if (iovec_memcmp(&IOVEC_MAKE(expected_hash, sizeof(expected_hash)), hash) != 0)
-                log_warning("Hash of best before marker file '%s' has unexpected value, ignoring.", fn);
+                log_warning("Hash of best before marker file '%s' has unexpected value, proceeding anyway.", fn);
 
         struct tm parsed_tm = {};
         const char *n = strptime(e, "%Y-%m-%d", &parsed_tm);