summaryrefslogtreecommitdiff
path: root/src/shared/bootspec.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-03-12 20:13:29 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-03-13 17:06:24 +0100
commitcc5957dca055bfdc6df24af47f6687d1ba1a3d7a (patch)
tree73daf12eea3d439dfc7261be5aa3405cee2cdb7e /src/shared/bootspec.c
parent0ae4456c93384191b2cc884fdc7542c8c869cdca (diff)
downloadsystemd-cc5957dca055bfdc6df24af47f6687d1ba1a3d7a.tar.gz
bootspec: don't log in boot_entries_load_config_auto() about no ESP
Let's do it in the caller instead. That way, logind can stay silent about it. Fixes: #11950
Diffstat (limited to 'src/shared/bootspec.c')
-rw-r--r--src/shared/bootspec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index f2b919b6bb..59930464bc 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -712,9 +712,7 @@ int boot_entries_load_config_auto(
}
r = find_esp_and_warn(override_esp_path, false, &esp_where, NULL, NULL, NULL, NULL);
- if (r == -ENOKEY) /* find_esp_and_warn() doesn't warn about this case */
- return log_error_errno(r, "Cannot find the ESP partition mount point.");
- if (r < 0) /* But it logs about all these cases, hence don't log here again */
+ if (r < 0) /* we don't log about ENOKEY here, but propagate it, leaving it to the caller to log */
return r;
r = find_xbootldr_and_warn(override_xbootldr_path, false, &xbootldr_where, NULL);