From f91ed3dc8154781edc98eef7e7f827a32679f141 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Jun 2018 19:31:50 +0200 Subject: [PATCH] bootspec: it's fine if loader.conf is absent We shouldn't generate an error in that case, as the file is optional. --- src/shared/bootspec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 82735833d0..ed4cd20bc8 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -153,8 +153,12 @@ static int boot_loader_read_conf(const char *path, BootConfig *config) { assert(config); f = fopen(path, "re"); - if (!f) + if (!f) { + if (errno == ENOENT) + return 0; + return log_error_errno(errno, "Failed to open \"%s\": %m", path); + } for (;;) { _cleanup_free_ char *buf = NULL, *field = NULL; @@ -204,7 +208,7 @@ static int boot_loader_read_conf(const char *path, BootConfig *config) { return log_error_errno(r, "%s:%u: Error while reading: %m", path, line); } - return 0; + return 1; } static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {