shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

Merge pull request #6659 from yuwata/econnrefused

Browse Source 
networkd: do not fail manager_connect_bus() if dbus is not active yet
This commit is contained in:
Lennart Poettering 2017-08-30 12:17:53 +02:00 committed by GitHub
commit 701afcbf12
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/networkd-manager.c
View File

@ -136,10 +136,9 @@ int manager_connect_bus(Manager *m) {
assert(m); assert(m);
r = sd_bus_default_system(&m->bus); r = sd_bus_default_system(&m->bus);
if (r == -ENOENT) { if (r < 0) {
/* We failed to connect? Yuck, we must be in early /* We failed to connect? Yuck, we must be in early
* boot. Let's try in 5s again. As soon as we have * boot. Let's try in 5s again. */
* kdbus we can stop doing this... */
log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m"); log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");

3
src/resolve/resolved-bus.c
View File

@ -1644,8 +1644,7 @@ int manager_connect_bus(Manager *m) {
r = sd_bus_default_system(&m->bus); r = sd_bus_default_system(&m->bus);
if (r < 0) { if (r < 0) {
/* We failed to connect? Yuck, we must be in early /* We failed to connect? Yuck, we must be in early
* boot. Let's try in 5s again. As soon as we have * boot. Let's try in 5s again. */
* kdbus we can stop doing this... */
log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m"); log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");