diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-06-22 19:26:22 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-08 21:40:44 +0200 |
commit | 21f7a622d503708163817c7874210aa518ada412 (patch) | |
tree | 4718fecf1b3514341d692b4a651f62b2a10d630f /src/boot/bootctl.c | |
parent | 36cd739a78bb9af7f3bad138576ec453b67c66b0 (diff) | |
download | systemd-21f7a622d503708163817c7874210aa518ada412.tar.gz |
bootspec: remove redundant logging
boot_loader_read_conf(), boot_entries_find(), boot_entries_load_config()
all log their errors internally, hence no need to log a second or third
time about the same error when they return.
Diffstat (limited to 'src/boot/bootctl.c')
-rw-r--r-- | src/boot/bootctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 04ba8f7170..dfd24f4677 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -272,8 +272,7 @@ static int status_entries(const char *esp_path, sd_id128_t partition) { r = boot_entries_load_config(esp_path, &config); if (r < 0) - return log_error_errno(r, "Failed to load bootspec config from \"%s/loader\": %m", - esp_path); + return r; if (config.default_entry < 0) printf("%zu entries, no entry suitable as default\n", config.n_entries); @@ -1013,8 +1012,7 @@ static int verb_list(int argc, char *argv[], void *userdata) { r = boot_entries_load_config(arg_path, &config); if (r < 0) - return log_error_errno(r, "Failed to load bootspec config from \"%s/loader\": %m", - arg_path); + return r; printf("Available boot entries:\n"); |