networkd: don't do exit-on-idle if there is something wrong with the dbus connection

Just fall back to plain old event loop in this (highly unlikely) case.

In the glorious future when kdbus is upstream we can of course drop all this.

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 4617f118675505c52f2f811f4d7c75dbef35ea79..ce97ac0778ca7e6a25698bd364ed301dd11ab9e5 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -534,13 +534,18 @@ static bool manager_check_idle(void *userdata) {
 int manager_run(Manager *m) {
         assert(m);
 
 int manager_run(Manager *m) {
         assert(m);
 

-        return bus_event_loop_with_idle(
-                        m->event,
-                        m->bus,
-                        "org.freedesktop.network1",
-                        DEFAULT_EXIT_USEC,
-                        manager_check_idle,
-                        m);
+        if (m->bus)
+                return bus_event_loop_with_idle(
+                                m->event,
+                                m->bus,
+                                "org.freedesktop.network1",
+                                DEFAULT_EXIT_USEC,
+                                manager_check_idle,
+                                m);
+        else
+                /* failed to connect to the bus, so we lose exit-on-idle logic,
+                   this should not happen except if dbus is not around at all */
+                return sd_event_loop(m->event);

 }
 
 int manager_load_config(Manager *m) {
 }
 
 int manager_load_config(Manager *m) {