New patch 0009-Don-t-fail-if-D-Bus-isn-t-running.patch
Don't fail if D-Bus isn't running
Guido Günther
13 years ago
| 0 | From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> | |
| 1 | Date: Tue, 12 Oct 2010 17:26:22 +0200 | |
| 2 | Subject: [PATCH] Don't fail if D-Bus isn't running | |
| 3 | ||
| 4 | we don't fail on hal, so we shouldn't fail on D-Bus either | |
| 5 | --- | |
| 6 | src/node_device/node_device_hal.c | 4 ++++ | |
| 7 | 1 files changed, 4 insertions(+), 0 deletions(-) | |
| 8 | ||
| 9 | diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c | |
| 10 | index 0174794..a6a6e25 100644 | |
| 11 | --- a/src/node_device/node_device_hal.c | |
| 12 | +++ b/src/node_device/node_device_hal.c | |
| 13 | @@ -725,6 +725,10 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) | |
| 14 | dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); | |
| 15 | if (dbus_conn == NULL) { | |
| 16 | VIR_ERROR0("dbus_bus_get failed"); | |
| 17 | + /* We don't want to show a fatal error here, | |
| 18 | + otherwise entire libvirtd shuts down when | |
| 19 | + D-Bus isn't running */ | |
| 20 | + ret = 0; | |
| 21 | goto failure; | |
| 22 | } | |
| 23 | dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); | |
| 24 | -- |