From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Jun 2018 17:31:50 +0000 (+0200)
Subject: bootspec: it's fine if loader.conf is absent
X-Git-Tag: v240~610^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f91ed3dc8154781edc98eef7e7f827a32679f141;p=thirdparty%2Fsystemd.git

bootspec: it's fine if loader.conf is absent

We shouldn't generate an error in that case, as the file is optional.
---

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 82735833d04..ed4cd20bc86 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) {