From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Tue, 23 Jan 2024 09:24:44 +0000 (+0100)
Subject: bootctl: return earlier with `--print-esp-path`
X-Git-Tag: v256-rc1~1069^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285ae04040ed911f56d2277b0027c7f56310a061;p=thirdparty%2Fsystemd.git

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`.
---

diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c
index 337b3eb4b55..b8813ec40a6 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 */