picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

We shouldn't generate an error in that case, as the file is optional.
This commit is contained in:
Lennart Poettering 2018-06-22 19:31:50 +02:00
parent 0de2e1fd2e
commit f91ed3dc81
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/bootspec.c
View File

@ -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) {