]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sysext: do not attempt to unlock images interactively
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 26 Aug 2025 18:12:53 +0000 (19:12 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 13 Oct 2025 08:04:47 +0000 (10:04 +0200)
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)

src/sysext/sysext.c

index f8439206f7ad599acf4cc0b8161e82465c930d31..57a894a42538b0ee51baac133c3beaff1bc08859 100644 (file)
@@ -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;