|
|
a547b4 |
From f3f132795fbbcbd890e30d98d1d3cfe2f7870347 Mon Sep 17 00:00:00 2001
|
|
|
a547b4 |
From: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
a547b4 |
Date: Tue, 18 Dec 2018 13:46:01 +0100
|
|
|
a547b4 |
Subject: [PATCH] systemd: Remove unneded virtio-port dependencies
|
|
|
a547b4 |
|
|
|
a547b4 |
The udev rule already adds SYSTEMD_WANTS=spice-vdagentd.socket
|
|
|
a547b4 |
to the relevant virtio devices, which automatically adds Wants=${device}
|
|
|
a547b4 |
to spice-vdagentd.socket (see 'systemctl show spice-vdagentd.socket').
|
|
|
a547b4 |
Adding a Requisite/After for these ports is at best redundant, and most
|
|
|
a547b4 |
likely wrong as this is causing boot time warnings:
|
|
|
a547b4 |
|
|
|
a547b4 |
[ INFO ] dev-virtio\x2dports-com.redhat.spice.0.device is not active.
|
|
|
a547b4 |
[DEPEND] Dependency failed for Activation socket for spice guest agent daemon.
|
|
|
a547b4 |
|
|
|
a547b4 |
https://bugzilla.redhat.com/show_bug.cgi?id=1545212
|
|
|
a547b4 |
|
|
|
a547b4 |
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
a547b4 |
(cherry picked from commit b07420eea0aaba1b9a375eac03c1dbb565287f11)
|
|
|
a547b4 |
|
|
|
a547b4 |
Note:
|
|
|
a547b4 |
- Conflict due not having commit below. As this patch removes that,
|
|
|
a547b4 |
not worth to backport it.
|
|
|
a547b4 |
|
|
|
a547b4 |
102b2e7 systemd: use "After" with "Requisite"
|
|
|
a547b4 |
---
|
|
|
a547b4 |
data/spice-vdagentd.socket | 2 --
|
|
|
a547b4 |
1 file changed, 2 deletions(-)
|
|
|
a547b4 |
|
|
|
a547b4 |
diff --git a/data/spice-vdagentd.socket b/data/spice-vdagentd.socket
|
|
|
a547b4 |
index e34a188..f14e662 100644
|
|
|
a547b4 |
--- a/data/spice-vdagentd.socket
|
|
|
a547b4 |
+++ b/data/spice-vdagentd.socket
|
|
|
a547b4 |
@@ -1,7 +1,5 @@
|
|
|
a547b4 |
[Unit]
|
|
|
a547b4 |
Description=Activation socket for spice guest agent daemon
|
|
|
a547b4 |
-# only start the socket if the virtio port device exists
|
|
|
a547b4 |
-Requisite=dev-virtio\x2dports-com.redhat.spice.0.device
|
|
|
a547b4 |
|
|
|
a547b4 |
[Socket]
|
|
|
a547b4 |
ListenStream=/var/run/spice-vdagentd/spice-vdagent-sock
|
|
|
a547b4 |
--
|
|
|
a547b4 |
2.20.1
|
|
|
a547b4 |
|