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`.
This commit is contained in:
Antonio Alvarez Feijoo
2024-01-23 10:24:44 +01:00
parent fc5edc91cb
commit 285ae04040
+2 -3
View File
@@ -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 */