]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Drop empty argument from dnsmasq call
authorGuido Günther <agx@sigxcpu.org>
Fri, 18 Feb 2011 14:32:02 +0000 (15:32 +0100)
committerGuido Günther <agx@sigxcpu.org>
Fri, 18 Feb 2011 21:23:15 +0000 (22:23 +0100)
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

index 98c59c9ac50a332bc94c6ede37c586b8748b0576..e666cbb1ff6588a68271d365d93168c83b1a2f73 100644 (file)
@@ -477,7 +477,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
     virCommandAddArgPair(cmd, "--pid-file", pidfile);
 
     /* *no* conf file */
-    virCommandAddArgList(cmd, "--conf-file=", "", NULL);
+    virCommandAddArg(cmd, "--conf-file=");
 
     virCommandAddArgList(cmd,
                          "--except-interface", "lo",