From 94f232bb9b90a99e379649487b5175ada6e8dcdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 13 Oct 2010 09:07:48 +0200 Subject: [PATCH] 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. --- src/node_device/node_device_hal.c | 4 ++++ 1 file changed, 4 insertions(+) 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);