SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved: /etc/resolved.conf missing is not an error

Browse Source 
Don't propagate any error in this case, it's really not an error.
This commit is contained in:
Lennart Poettering
2015-11-25 21:58:37 +01:00
parent 97f1b2f354
commit e3528a5c46
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-manager.c
+8 -6
View File
@@ -597,9 +597,10 @@ int manager_read_resolv_conf(Manager *m) {
r = stat("/etc/resolv.conf", &st);
if (r < 0) {
if (errno != ENOENT)
log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
r = -errno;
if (errno == ENOENT)
r = 0;
else
r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
goto clear;
}
@@ -620,9 +621,10 @@ int manager_read_resolv_conf(Manager *m) {
f = fopen("/etc/resolv.conf", "re");
if (!f) {
if (errno != ENOENT)
log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
r = -errno;
if (errno == ENOENT)
r = 0;
else
r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m");
goto clear;
}