src: remove deps on ip[6]tables/firewalld.service from systemd units

The unit files both have After=network.target, and this in turn implies
After=network-pre.target. Both iptables.service & ip6tables.service have
Before=network-pre.target since Fedora >= 35 and RHEL >= 8.4.

When we first added the deps on ip[6]tables.service in

  commit 0756415f147dda15a417bd79eef9a62027d176e6
  Author: Laine Stump <laine@redhat.com>
  Date:   Fri May 1 00:05:50 2020 -0400

    systemd: start libvirtd after firewalld/iptables services

the Before=network-pre.target didn't exist, but we can rely on it now
given our supported platforms matrix.

The firewalld.service has similarly has a Before=network-pre.target,
even when we took that commit above, so this dep was in face never
actually needed. This answers the question posed in that above commit
message about firewalld ordering.

https://gitlab.com/libvirt/libvirt/-/issues/489
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
index f35cccb8f7dfd0508c3b8bf544065c8c8033e1aa..3d7374715d84add3c1976f48556c8b57a60c8cf0 100644 (file)
--- a/src/network/virtnetworkd.service.in
+++ b/src/network/virtnetworkd.service.in
@@ -5,9 +5,6 @@ Requires=virtnetworkd.socket
 Requires=virtnetworkd-ro.socket
 Requires=virtnetworkd-admin.socket
 After=network.target
-After=firewalld.service
-After=iptables.service
-After=ip6tables.service
 After=dbus.service
 After=apparmor.service
 Documentation=man:virtnetworkd(8)

diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index b691d359384fddb483cd06241ad5ee79d01a12a8..afda257228b952bdbef4314b4852babd27087b1d 100644 (file)
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -10,9 +10,6 @@ Wants=libvirtd-admin.socket
 Wants=virtlockd.socket
 Wants=systemd-machined.service
 After=network.target
-After=firewalld.service
-After=iptables.service
-After=ip6tables.service
 After=dbus.service
 After=iscsid.service
 After=apparmor.service