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