Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: disable netfilter-persistent.service

Browse Source 
This is now handled by qubes-iptables.service

qubesos/qubes-issues#1067
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-09 20:32:35 +02:00
parent 9e17db2901
commit 3ccbde9a3c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -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
vm-systemd/netfilter-persistent.service.d/30_qubes.conf Normal file
View File

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