morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

bootctl: move conditions into corresponding functions

Browse Source
This commit is contained in:
Yu Watanabe
2025-10-26 16:57:07 +09:00
parent 61d1f394cc
commit 1b48b63b51
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bootctl/bootctl-install.c
View File

@@ -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());

3
src/bootctl/bootctl-random-seed.c
View File

@@ -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);