[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.2-4-2-gedaf33a

[Guido Günther]

The following commit has been merged in the experimental branch:
commit d4e2b710b88040ca9e73e54c9dbe6262aa194d66
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue May 10 21:59:47 2011 +0200

    Drop Make-sure-DNSMASQ_STATE_DIR-exists.patch
    
    applied upstream

diff --git a/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch b/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch
deleted file mode 100644
index 8c0865e..0000000
--- a/debian/patches/Make-sure-DNSMASQ_STATE_DIR-exists.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 e095d2a..a06759e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ 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