[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-lenny, updated. debian/0.8.1-2.bpo50+1-3-g7109d3c

[Guido Günther]

The following commit has been merged in the bpo-lenny branch:
commit 7bbb4e22dd094e6c037db7f8129f5a568d5f0bfe
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Oct 12 17:27:14 2010 +0200

    New patch 0009-Don-t-fail-if-D-Bus-isn-t-running.patch
    
    Don't fail if D-Bus isn't running

diff --git a/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch b/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch
new file mode 100644
index 0000000..552fdb3
--- /dev/null
+++ b/debian/patches/0009-Don-t-fail-if-D-Bus-isn-t-running.patch
@@ -0,0 +1,25 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 12 Oct 2010 17:26:22 +0200
+Subject: [PATCH] Don't fail if D-Bus isn't running
+
+we don't fail on hal, so we shouldn't fail on D-Bus either
+---
+ src/node_device/node_device_hal.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
+index 0174794..a6a6e25 100644
+--- a/src/node_device/node_device_hal.c
++++ b/src/node_device/node_device_hal.c
+@@ -725,6 +725,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);
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 7ea249d..a68db2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Don-t-drop-caps-when-exec-ing-qemu.patch
 0007-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 0008-Fix-leaks-in-udev-device-add-remove.patch
+0009-Don-t-fail-if-D-Bus-isn-t-running.patch

-- 
Libvirt Debian packaging