28 lines
958 B
Diff
28 lines
958 B
Diff
|
From 10f7c0956e7c7054da9e6187aa525c23f65a8dfc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Garver <eric@garver.life>
|
||
|
|
Date: Tue, 14 Apr 2020 07:40:48 -0400
|
||
|
|
Subject: [PATCH 10/10] fix(systemd): Conflict with nftables.service
|
||
|
|
|
||
|
|
(cherry picked from commit 7b6aff3a51a955399c782f48137405d0fa94e966)
|
||
|
|
(cherry picked from commit fc00563ef029cb4c12c652725bfd3a3b5122d136)
|
||
|
|
---
|
||
|
|
config/firewalld.service.in | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/config/firewalld.service.in b/config/firewalld.service.in
|
||
|
|
index b757a08f28dc..afbe0ac5def7 100644
|
||
|
|
--- a/config/firewalld.service.in
|
||
|
|
+++ b/config/firewalld.service.in
|
||
|
|
@@ -4,7 +4,7 @@ Before=network-pre.target
|
||
|
|
Wants=network-pre.target
|
||
|
|
After=dbus.service
|
||
|
|
After=polkit.service
|
||
|
|
-Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
|
||
|
|
+Conflicts=iptables.service ip6tables.service ebtables.service ipset.service nftables.service
|
||
|
|
Documentation=man:firewalld(1)
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
--
|
||
|
|
2.25.2
|
||
|
|
|