blob: cc90b9d797d7b749612f12ad3bc6311517672666 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
|
Drops the/an obsolete 'conflicts' line with old iptables services bug #833506
Removes EnvironmentFile and FIREWALLD_ARGS variable
--- a/config/firewalld.service.in
+++ b/config/firewalld.service.in
@@ -5,12 +5,10 @@ Wants=network-pre.target
# Use PartOf so firewalld is restarted when dbus is restarted. But it doesn't
# have to wait on it initially.
PartOf=dbus.service
-Conflicts=iptables.service ip6tables.service ebtables.service ipset.service
Documentation=man:firewalld(1)
[Service]
-EnvironmentFile=-/etc/sysconfig/firewalld
-ExecStart=@sbindir@/firewalld --nofork --nopid $FIREWALLD_ARGS
+ExecStart=@sbindir@/firewalld --nofork --nopid
ExecReload=/bin/kill -HUP $MAINPID
StandardOutput=null
StandardError=null
|
