Browse Source

debian: disable netfilter-persistent.service

This is now handled by qubes-iptables.service

qubesos/qubes-issues#1067
Marek Marczykowski-Górecki 8 years ago
parent
commit
3ccbde9a3c
2 changed files with 5 additions and 0 deletions
  1. 3 0
      Makefile
  2. 2 0
      vm-systemd/netfilter-persistent.service.d/30_qubes.conf

+ 3 - 0
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:

+ 2 - 0
vm-systemd/netfilter-persistent.service.d/30_qubes.conf

@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/netfilter-persistent