From 3ccbde9a3ca4fee04b45822e3cbcc536ea01e976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 9 Aug 2015 20:32:35 +0200
Subject: [PATCH] debian: disable netfilter-persistent.service

This is now handled by qubes-iptables.service

qubesos/qubes-issues#1067
---
 Makefile                                                | 3 +++
 vm-systemd/netfilter-persistent.service.d/30_qubes.conf | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 vm-systemd/netfilter-persistent.service.d/30_qubes.conf

diff --git a/Makefile b/Makefile
index e0b2e95..d4344e1 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,9 @@ ifeq ($(shell lsb_release -is), Debian)
     # Wheezy Dropins
     # Disable sysinit 'network-manager.service' since systemd 'NetworkManager.service' is already installed
     DROPINS += $(strip $(if $(filter wheezy, $(shell lsb_release -cs)), network-manager.service,))
+
+	# handled by qubes-iptables service now
+    DROPINS += netfilter-persistent.service
 endif
 
 install-systemd-dropins:
diff --git a/vm-systemd/netfilter-persistent.service.d/30_qubes.conf b/vm-systemd/netfilter-persistent.service.d/30_qubes.conf
new file mode 100644
index 0000000..f71617f
--- /dev/null
+++ b/vm-systemd/netfilter-persistent.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/netfilter-persistent