From 285ae04040ed911f56d2277b0027c7f56310a061 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Tue, 23 Jan 2024 10:24:44 +0100 Subject: [PATCH 1/2] bootctl: return earlier with `--print-esp-path` `--print-esp-path` and `--print-boot-path` cannot be combined, so it's not necessary to acquire the XBOOTLDR partition with `--print-esp-path`. --- src/boot/bootctl-status.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c index 337b3eb4b5..b8813ec40a 100644 --- a/src/boot/bootctl-status.c +++ b/src/boot/bootctl-status.c @@ -326,6 +326,7 @@ int verb_status(int argc, char *argv[], void *userdata) { return r; puts(arg_esp_path); + return 0; } r = acquire_xbootldr(/* unprivileged_mode= */ -1, &xbootldr_uuid, &xbootldr_devid); @@ -340,10 +341,8 @@ int verb_status(int argc, char *argv[], void *userdata) { return log_error_errno(SYNTHETIC_ERRNO(EACCES), "Failed to determine XBOOTLDR location: %m"); puts(path); - } - - if (arg_print_esp_path || arg_print_dollar_boot_path) return 0; + } r = 0; /* If we couldn't determine the path, then don't consider that a problem from here on, just * show what we can show */ From 597a3cfd5249f1a1dc81aa6c23fd4830a0575da5 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Tue, 23 Jan 2024 10:33:26 +0100 Subject: [PATCH 2/2] man/bootctl: typo in `--print-boot-path` description --- man/bootctl.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/bootctl.xml b/man/bootctl.xml index eae2213536..bbcef151b7 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -353,7 +353,7 @@ Specification Type #2 entries should be placed in the directory $(bootctl -x)/EFI/Linux/. - Note that this option (similarly to the option mentioned + Note that this option (similarly to the option mentioned above), is available independently from the boot loader used, i.e. also without systemd-boot being installed.