From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 10 Jun 2024 12:57:18 +0000 (+0200)
Subject: pcrlock: don't override conf_root parameter for boot_entry_token_ensure()
X-Git-Tag: v257-rc1~1155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2f451d8766723ffec268859b0e4898f7a025ec0;p=thirdparty%2Fsystemd.git

pcrlock: don't override conf_root parameter for boot_entry_token_ensure()

if we pass NULL boot_entry_token_ensure() will use its own default,
which is the same as what we passed so far explicitly, hence let's make
use of that.
---

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index a40d23a347b..0abb4699997 100644
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -4329,7 +4329,7 @@ static int determine_boot_policy_file(char **ret) {
 
         r = boot_entry_token_ensure(
                         /* root= */ NULL,
-                        "/etc/kernel",
+                        /* conf_root= */ NULL,
                         machine_id,
                         /* machine_id_is_random = */ false,
                         &arg_entry_token_type,