From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 13 Oct 2010 07:07:48 +0000 (+0200)
Subject: Don't fail on missing D-Bus
X-Git-Tag: v0.8.5~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f232bb9b90a99e379649487b5175ada6e8dcdb;p=thirdparty%2Flibvirt.git

Don't fail on missing D-Bus

We don't fail when we can't contact HAL so we shouldn't fail if we can't
contact D-Bus either.
---

diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index c2b3c8f5b3..547e5ca18d 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -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);