[Pkg-libvirt-commits] [libvirt] 01/04: Fix path to qemu-bridge-helper

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch debian/experimental
in repository libvirt.

commit 2caf1bbb86311f28f0190818f7e76ea64b64cad3
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Aug 13 14:48:49 2015 +0200

    Fix path to qemu-bridge-helper
    
    Closes: #790935
---
 .../patches/Fix-path-to-qemu-bridge-helper.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/Fix-path-to-qemu-bridge-helper.patch b/debian/patches/Fix-path-to-qemu-bridge-helper.patch
new file mode 100644
index 0000000..a6e7228
--- /dev/null
+++ b/debian/patches/Fix-path-to-qemu-bridge-helper.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 13 Aug 2015 14:45:11 +0200
+Subject: Fix path to qemu-bridge-helper
+
+Closes: #790935
+---
+ src/qemu/qemu_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 29049dc..37e9ff0 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -295,7 +295,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
+             goto error;
+     }
+ 
+-    if (VIR_STRDUP(cfg->bridgeHelperName, "/usr/libexec/qemu-bridge-helper") < 0)
++    if (VIR_STRDUP(cfg->bridgeHelperName, "/usr/lib/qemu/qemu-bridge-helper") < 0)
+         goto error;
+ 
+     cfg->clearEmulatorCapabilities = true;
diff --git a/debian/patches/series b/debian/patches/series
index 3657ee0..b5896b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 virNetSocketCheckProtocols-handle-EAI_NONAME-as-IPv6.patch
 Mark-symbols-in-libvirt-admin-as-local.patch
+Fix-path-to-qemu-bridge-helper.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git