[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.1.0-2-1-g3a2a899

[Guido Günther]

The following commit has been merged in the master branch:
commit 3a2a899127b06e49c33498a4465a4a6aa1dee36d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jul 11 17:25:32 2013 +0200

    Create directory for lease files if it's missing
    
    Closes: #715200

diff --git a/debian/patches/Create-directory-for-lease-files-if-it-s-missing.patch b/debian/patches/Create-directory-for-lease-files-if-it-s-missing.patch
new file mode 100644
index 0000000..8b10ce8
--- /dev/null
+++ b/debian/patches/Create-directory-for-lease-files-if-it-s-missing.patch
@@ -0,0 +1,39 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 7 Jul 2013 14:59:48 +0200
+Subject: Create directory for lease files if it's missing
+
+If we don't autostart a network it's not being created.
+
+Debian Bug http://bugs.debian.org/715200
+---
+ src/nwfilter/nwfilter_dhcpsnoop.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
+index 708e67f..3fdb507 100644
+--- a/src/nwfilter/nwfilter_dhcpsnoop.c
++++ b/src/nwfilter/nwfilter_dhcpsnoop.c
+@@ -74,8 +74,9 @@
+ 
+ #ifdef HAVE_LIBPCAP
+ 
+-# define LEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.leases"
+-# define TMPLEASEFILE LOCALSTATEDIR "/run/libvirt/network/nwfilter.ltmp"
++# define LEASEFILE_DIR LOCALSTATEDIR "/run/libvirt/network/"
++# define LEASEFILE LEASEFILE_DIR "nwfilter.leases"
++# define TMPLEASEFILE LEASEFILE_DIR "nwfilter.ltmp"
+ 
+ struct virNWFilterSnoopState {
+     /* lease file */
+@@ -1893,6 +1894,11 @@ virNWFilterSnoopLeaseFileRefresh(void)
+ {
+     int tfd;
+ 
++    if (virFileMakePathWithMode(LEASEFILE_DIR, 0700) < 0) {
++        virReportError(errno, _("mkdir(\"%s\")"), LEASEFILE_DIR);
++        return;
++    }
++
+     if (unlink(TMPLEASEFILE) < 0 && errno != ENOENT)
+         virReportSystemError(errno, _("unlink(\"%s\")"), TMPLEASEFILE);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6148614..9714647 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
+Create-directory-for-lease-files-if-it-s-missing.patch

-- 
Libvirt Debian packaging