From 1b48b63b517e483cd77094df747bb896eba26dfc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 26 Oct 2025 16:57:07 +0900 Subject: [PATCH] bootctl: move conditions into corresponding functions --- src/bootctl/bootctl-install.c | 19 +++++++++---------- src/bootctl/bootctl-random-seed.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c index f31c55d36a5..a0a2ba49081 100644 --- a/src/bootctl/bootctl-install.c +++ b/src/bootctl/bootctl-install.c @@ -626,6 +626,9 @@ static int efi_timestamp(EFI_TIME *ret) { #endif static int install_secure_boot_auto_enroll(const char *esp, X509 *certificate, EVP_PKEY *private_key) { + if (!arg_secure_boot_auto_enroll) + return 0; + #if HAVE_OPENSSL int r; @@ -1101,17 +1104,13 @@ int verb_install(int argc, char *argv[], void *userdata) { if (r < 0) return r; - if (arg_install_random_seed) { - r = install_random_seed(arg_esp_path); - if (r < 0) - return r; - } + r = install_random_seed(arg_esp_path); + if (r < 0) + return r; - if (arg_secure_boot_auto_enroll) { - r = install_secure_boot_auto_enroll(arg_esp_path, certificate, private_key); - if (r < 0) - return r; - } + r = install_secure_boot_auto_enroll(arg_esp_path, certificate, private_key); + if (r < 0) + return r; } r = install_loader_specification(arg_dollar_boot_path()); diff --git a/src/bootctl/bootctl-random-seed.c b/src/bootctl/bootctl-random-seed.c index c4811aace33..8abb6c19697 100644 --- a/src/bootctl/bootctl-random-seed.c +++ b/src/bootctl/bootctl-random-seed.c @@ -122,6 +122,9 @@ int install_random_seed(const char *esp) { assert_cc(RANDOM_EFI_SEED_SIZE == SHA256_DIGEST_SIZE); + if (!arg_install_random_seed) + return 0; + esp_fd = open(esp, O_DIRECTORY|O_RDONLY|O_CLOEXEC); if (esp_fd < 0) return log_error_errno(errno, "Failed to open ESP directory '%s': %m", esp); -- 2.47.3