[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.0-1-1-g3a8e07f

[Guido Günther]

The following commit has been merged in the master branch:
commit 3a8e07fcba413f7fe7f793127124c512eb9a86ae
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Apr 23 14:35:52 2011 +0200

    New patch Make-sure-DNSMASQ_STATE_DIR-exists.patch
    
    Closes: #623536

diff --git a/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch b/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch
new file mode 100644
index 0000000..8c0865e
--- /dev/null
+++ b/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 23 Apr 2011 14:28:44 +0200
+Subject: Make sure DNSMASQ_STATE_DIR exists
+
+otherwise the directory returned by networkDnsmasqLeaseFileName will not be
+created if ipdef->nhosts == 0 in networkBuildDnsmasqArgv.
+
+Closes: #623536
+---
+ src/network/bridge_driver.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index ea2bfd4..9cf0e7c 100644
+--- a/src/network/bridge_driver.c
++++ b/src/network/bridge_driver.c
+@@ -648,6 +648,13 @@ networkStartDhcpDaemon(virNetworkObjPtr network)
+         goto cleanup;
+     }
+ 
++    if ((err = virFileMakePath(DNSMASQ_STATE_DIR)) != 0) {
++        virReportSystemError(err,
++                             _("cannot create directory %s"),
++                             DNSMASQ_STATE_DIR);
++        goto cleanup;
++    }
++
+     cmd = virCommandNew(DNSMASQ);
+     if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd) < 0) {
+         goto cleanup;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a06759e..e095d2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ Disable-CHECKSUM-rule.patch
 Debianize-libvirt-guests.patch
 virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-daemon-start-test.patch
+Make-sure-DNSMASQ_STATE_DIR-exists.patch

-- 
Libvirt Debian packaging