From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 5 Mar 2025 15:13:55 +0000 (+0100)
Subject: tpm2-clear: make it clear that we default to true for systemd.tpm2_allow_clear
X-Git-Tag: v258-rc1~1162^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1d790a18bef5ceaa9dc151d7a5f80a128b3ab0c;p=thirdparty%2Fsystemd.git

tpm2-clear: make it clear that we default to true for systemd.tpm2_allow_clear
---

diff --git a/src/tpm2-setup/tpm2-clear.c b/src/tpm2-setup/tpm2-clear.c
index 0dcee96a07a..5c4fc2a5dee 100644
--- a/src/tpm2-setup/tpm2-clear.c
+++ b/src/tpm2-setup/tpm2-clear.c
@@ -94,14 +94,15 @@ static int request_tpm2_clear(void) {
 
         if (clear < 0) {
                 bool b;
-                r = proc_cmdline_get_bool("systemd.tpm2_allow_clear", /* flags= */ 0, &b);
+                r = proc_cmdline_get_bool("systemd.tpm2_allow_clear", PROC_CMDLINE_TRUE_WHEN_MISSING, &b);
                 if (r < 0)
                         return log_error_errno(r, "Failed to parse systemd.tpm2_allow_clear kernel command line argument: %m");
-                if (r > 0)
-                        clear = b;
+                clear = b;
         }
 
-        if (clear == 0) {
+        assert(clear >= 0);
+
+        if (!clear) {
                 log_info("Clearing TPM2 disabled, exiting early.");
                 return 0;
         }