mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
99fd0daff9
Signed-off-by: Brahmajit Das <listout@listout.xyz> Part-of: https://github.com/gentoo/gentoo/pull/44849 Signed-off-by: Sam James <sam@gentoo.org>
19 lines
660 B
Diff
19 lines
660 B
Diff
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
|
|
Requires=dbus.service
|
|
After=dbus.service
|
|
After=polkit.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
|