]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't fail on missing D-Bus
authorGuido Günther <agx@sigxcpu.org>
Wed, 13 Oct 2010 07:07:48 +0000 (09:07 +0200)
committerGuido Günther <agx@sigxcpu.org>
Wed, 13 Oct 2010 12:47:19 +0000 (14:47 +0200)
We don't fail when we can't contact HAL so we shouldn't fail if we can't
contact D-Bus either.

src/node_device/node_device_hal.c

index c2b3c8f5b3173b6c8520352b4eacabae84526a96..547e5ca18d7c29e317bbdf28c00283a620f3cb6f 100644 (file)
@@ -724,6 +724,10 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED)
     dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
     if (dbus_conn == NULL) {
         VIR_ERROR0(_("dbus_bus_get failed"));
+        /* We don't want to show a fatal error here,
+           otherwise entire libvirtd shuts down when
+           D-Bus isn't running */
+        ret = 0;
         goto failure;
     }
     dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE);