services: Weaken systemd dependency on virtlockd

The systemd service files of the qemu and libxl driver currently have a
'Requires' dependency on virtlockd, which is too strong since virtlockd
is not enabled by default in either driver. Change the dependency to a
'Wants' to avoid a package dependency between the driver subpackages and
the new libvirt-daemon-lock subpackage.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
index 6b083c414f89990bacd837afdadc43ad711ae1a7..9171d4fdf833581f6bc88be9be6ba8a1ddeb7138 100644 (file)
--- a/src/libxl/virtxend.service.in
+++ b/src/libxl/virtxend.service.in
@@ -1,10 +1,10 @@
 [Unit]
 Description=Virtualization xen daemon
 Conflicts=libvirtd.service
-Requires=virtlockd.socket
 Requires=virtxend.socket
 Requires=virtxend-ro.socket
 Requires=virtxend-admin.socket
+Wants=virtlockd.socket
 After=network.target
 After=dbus.service
 After=apparmor.service

diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
index 9ae3f01fa099055acd41ac5838c9a3b54c58f44e..315359e2876b15e8b68b9c0b46fdabf0cd16137d 100644 (file)
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -2,10 +2,10 @@
 Description=Virtualization qemu daemon
 Conflicts=libvirtd.service
 Requires=virtlogd.socket
-Requires=virtlockd.socket
 Requires=virtqemud.socket
 Requires=virtqemud-ro.socket
 Requires=virtqemud-admin.socket
+Wants=virtlockd.socket
 Wants=systemd-machined.service
 After=network.target
 After=dbus.service

diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 954df5d1e5ccb61ed2a30181c1acb36bf525e1c2..30588279f89187464eaf6ebe9d1052c94fd7e851 100644 (file)
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -1,13 +1,13 @@
 [Unit]
 Description=Virtualization daemon
 Requires=virtlogd.socket
-Requires=virtlockd.socket
 # Use Wants instead of Requires so that users
 # can disable these three .socket units to revert
 # to a traditional non-activation deployment setup
 Wants=libvirtd.socket
 Wants=libvirtd-ro.socket
 Wants=libvirtd-admin.socket
+Wants=virtlockd.socket
 Wants=systemd-machined.service
 After=network.target
 After=firewalld.service