[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] Drop empty argument from dnsmasq call



Hi,
Libvirt currently fails to start with dnsmasq >= 2.56.
since dnsmasq now bails out with empty arguments. See

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613944

for the Debian bug and

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589885

for the upstream reasoning.

Tested with 2.55 and 2.56. O.k. to apply?
Cheers,
 -- Guido
>From a843d498d149409079fc8a99d52301af67adfd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx sigxcpu org>
Date: Fri, 18 Feb 2011 15:32:02 +0100
Subject: [PATCH] Drop empty argument from dnsmasq call

since dnsmasq >= 2.56 now bails out with empty arguments. See
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613944
for the Debian bug and
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589885
for the upstream reasoning.
---
 src/network/bridge_driver.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 98c59c9..cd21ee0 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -477,7 +477,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
     virCommandAddArgPair(cmd, "--pid-file", pidfile);
 
     /* *no* conf file */
-    virCommandAddArgList(cmd, "--conf-file=", "", NULL);
+    virCommandAddArgList(cmd, "--conf-file=", NULL);
 
     virCommandAddArgList(cmd,
                          "--except-interface", "lo",
-- 
1.7.2.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]