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.

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 04ba8f7170b8b5ce64150aa269cb0b83111ec134..dfd24f4677ffa3b8580f3aeb763316037eabd06f 100644 (file)
--- 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");
 

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 5d8471c51a88144b6eddeffd68e5d7b2ad3ec285..38123faa630313b17978f7d551b2c9adbe789175 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -362,12 +362,12 @@ int boot_entries_load_config(const char *esp_path, BootConfig *config) {
         p = strjoina(esp_path, "/loader/loader.conf");
         r = boot_loader_read_conf(p, config);
         if (r < 0)
-                return log_error_errno(r, "Failed to read boot config from \"%s\": %m", p);
+                return r;
 
         p = strjoina(esp_path, "/loader/entries");
         r = boot_entries_find(p, &config->entries, &config->n_entries);
         if (r < 0)
-                return log_error_errno(r, "Failed to read boot entries from \"%s\": %m", p);
+                return r;
 
         r = boot_entries_uniquify(config->entries, config->n_entries);
         if (r < 0)