Remove Before=libvirt-guests.service from other services

libvirt-guests has After= dependency for all the sockets and that is enough.
With the extra Before= in the service file systemd postpones the start of the
socket activated service (when libvirt-guests is trying to connect to the
socket) until after libvirt-guests is stopped effectively making `systemctl stop
libvirt-guests` deadlock.  The reason for that is that all stop jobs are
scheduled before any start job.  Removing the redundant Before= specification
fixes this behaviour.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in
index f53a12ea056c21fa2f69a78da0dfb87dc70b2e1b..8c22b02c9e709b8c2d56cf352c8185f3a3e895c2 100644 (file)
--- a/src/ch/virtchd.service.in
+++ b/src/ch/virtchd.service.in
@@ -5,7 +5,6 @@ Requires=virtchd.socket
 Requires=virtchd-ro.socket
 Requires=virtchd-admin.socket
 Wants=systemd-machined.service
-Before=libvirt-guests.service
 After=network.target
 After=dbus.service
 After=apparmor.service

diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
index 334c34db441330136b688bdc393118ec95d0e30d..9946db9462198bf9c71b401429c140d2de34373d 100644 (file)
--- a/src/lxc/virtlxcd.service.in
+++ b/src/lxc/virtlxcd.service.in
@@ -5,7 +5,6 @@ Requires=virtlxcd.socket
 Requires=virtlxcd-ro.socket
 Requires=virtlxcd-admin.socket
 Wants=systemd-machined.service
-Before=libvirt-guests.service
 After=network.target
 After=dbus.service
 After=apparmor.service

diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
index 5ad968ace92a1147a73c4cbb39771a606461ab7e..9ae3f01fa099055acd41ac5838c9a3b54c58f44e 100644 (file)
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -7,7 +7,6 @@ Requires=virtqemud.socket
 Requires=virtqemud-ro.socket
 Requires=virtqemud-admin.socket
 Wants=systemd-machined.service
-Before=libvirt-guests.service
 After=network.target
 After=dbus.service
 After=apparmor.service

diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 5d4d412fccb8ac9161760bbcd0d3eb0efa3a07eb..954df5d1e5ccb61ed2a30181c1acb36bf525e1c2 100644 (file)
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -9,7 +9,6 @@ Wants=libvirtd.socket
 Wants=libvirtd-ro.socket
 Wants=libvirtd-admin.socket
 Wants=systemd-machined.service
-Before=libvirt-guests.service
 After=network.target
 After=firewalld.service
 After=iptables.service