From fb72b1d99f661ea62fd534e4bc1174c6337611c8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 23 Aug 2017 12:36:36 +0900 Subject: [PATCH 1/2] networkd: do not fail manager_connect_bus() if dbus is not active yet Fixes #6618. --- src/network/networkd-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index c28088d3a3c..d04982837d1 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -136,7 +136,7 @@ int manager_connect_bus(Manager *m) { assert(m); r = sd_bus_default_system(&m->bus); - if (r == -ENOENT) { + if (r < 0) { /* We failed to connect? Yuck, we must be in early * boot. Let's try in 5s again. As soon as we have * kdbus we can stop doing this... */ From d7ea7bb8a8da9f94d8fbc5be2c5c4b2ebe40b7b3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 23 Aug 2017 12:38:56 +0900 Subject: [PATCH 2/2] network,resolve: remove comments related to kdbus --- src/network/networkd-manager.c | 3 +-- src/resolve/resolved-bus.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index d04982837d1..45f9b3d359b 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -138,8 +138,7 @@ int manager_connect_bus(Manager *m) { r = sd_bus_default_system(&m->bus); if (r < 0) { /* We failed to connect? Yuck, we must be in early - * boot. Let's try in 5s again. As soon as we have - * kdbus we can stop doing this... */ + * boot. Let's try in 5s again. */ log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m"); diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 5aa23485761..bf822d3aaa5 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1644,8 +1644,7 @@ int manager_connect_bus(Manager *m) { r = sd_bus_default_system(&m->bus); if (r < 0) { /* We failed to connect? Yuck, we must be in early - * boot. Let's try in 5s again. As soon as we have - * kdbus we can stop doing this... */ + * boot. Let's try in 5s again. */ log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");