From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 26 Aug 2025 18:12:53 +0000 (+0100)
Subject: sysext: do not attempt to unlock images interactively
X-Git-Tag: v257.10~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee2e4a13517a08f59d028017bf33869435a2a141;p=thirdparty%2Fsystemd.git

sysext: do not attempt to unlock images interactively

These images are not using a passphrase, they are using keys
or at most TPM-based sealing (not yet implemented, for contexts).

Do not use the interactive helper, as it will block and ask the
user for a password if it fails to find the signing cert, which
is not useful for this tool.

Fixes https://github.com/systemd/systemd/issues/33179

(cherry picked from commit 09f655ad4af59ef4ff8ebd02ca5421f8901cb16b)
---

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index f8439206f7a..57a894a4253 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -1771,10 +1771,7 @@ static int merge_subprocess(
                         if (r < 0)
                                 return r;
 
-                        r = dissected_image_decrypt_interactively(
-                                        m, NULL,
-                                        &verity_settings,
-                                        flags);
+                        r = dissected_image_decrypt(m, /* passphrase= */ NULL, &verity_settings, flags);
                         if (r < 0)
                                 return r;