[PATCH 0/4] contrib: qemu-guest-agent.service updates

[PATCH 0/4] contrib: qemu-guest-agent.service updates

[Cole Robinson]

This series extends qemu-guest-agent.service with some bits that
distros are adding, mostly changes from RHEL that have bubbled up
to Fedora.

Cole Robinson (4):
  contrib: qemu-guest-agent.service: s/BindTo/BindsTo/g
  contrib: qemu-guest-agent.service: Add Documentation= link
  contrib: qemu-guest-agent.service: Don't ignore failure
  contrib: qemu-guest-agent.service: Use IgnoreOnIsolate=True

 contrib/systemd/qemu-guest-agent.service | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-- 
2.31.1

[PATCH 1/4] contrib: qemu-guest-agent.service: s/BindTo/BindsTo/g

[Cole Robinson]

BindsTo is the documented name for this option, added in systemd
187 released in July 2012

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 contrib/systemd/qemu-guest-agent.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/systemd/qemu-guest-agent.service b/contrib/systemd/qemu-guest-agent.service
index 51cd7b37ff..59f7ecb1b8 100644
--- a/contrib/systemd/qemu-guest-agent.service
+++ b/contrib/systemd/qemu-guest-agent.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=QEMU Guest Agent
-BindTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+BindsTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 
 [Service]
-- 
2.31.1

[PATCH 2/4] contrib: qemu-guest-agent.service: Add Documentation= link

[Cole Robinson]

OpenSUSE adds this to their service file

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 contrib/systemd/qemu-guest-agent.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/systemd/qemu-guest-agent.service b/contrib/systemd/qemu-guest-agent.service
index 59f7ecb1b8..7e1c50577b 100644
--- a/contrib/systemd/qemu-guest-agent.service
+++ b/contrib/systemd/qemu-guest-agent.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=QEMU Guest Agent
+Documentation=https://wiki.qemu.org/Features/GuestAgent
 BindsTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 
-- 
2.31.1

[PATCH 3/4] contrib: qemu-guest-agent.service: Don't ignore failure

[Cole Robinson]

RHEL7+ and Fedora don't ignore errors, nor Arch. Debian and OpenSUSE
do but I think that's because their service files are based on
this / what Fedora used to ship.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 contrib/systemd/qemu-guest-agent.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/systemd/qemu-guest-agent.service b/contrib/systemd/qemu-guest-agent.service
index 7e1c50577b..505636a5ba 100644
--- a/contrib/systemd/qemu-guest-agent.service
+++ b/contrib/systemd/qemu-guest-agent.service
@@ -5,7 +5,7 @@ BindsTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 
 [Service]
-ExecStart=-/usr/bin/qemu-ga
+ExecStart=/usr/bin/qemu-ga
 Restart=always
 RestartSec=0
 
-- 
2.31.1

[PATCH 4/4] contrib: qemu-guest-agent.service: Use IgnoreOnIsolate=True

[Cole Robinson]

Changing runlevel (telinit 3) will stop qemu-guest-agent.service, and
it won't ever restart, because it's intended to only start when the
specified virtio device is added.

Use IgnoreOnIsolate=True plus Install WantedBy= to keep the agent
running regardless of runlevel, which is the expected behavior IMO.

This has been in RHEL since 7.2ish timeframe:
https://bugzilla.redhat.com/show_bug.cgi?id=1165176

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 contrib/systemd/qemu-guest-agent.service | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/systemd/qemu-guest-agent.service b/contrib/systemd/qemu-guest-agent.service
index 505636a5ba..bb419fe55f 100644
--- a/contrib/systemd/qemu-guest-agent.service
+++ b/contrib/systemd/qemu-guest-agent.service
@@ -3,6 +3,7 @@ Description=QEMU Guest Agent
 Documentation=https://wiki.qemu.org/Features/GuestAgent
 BindsTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
 After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
+IgnoreOnIsolate=True
 
 [Service]
 ExecStart=/usr/bin/qemu-ga
@@ -10,3 +11,4 @@ Restart=always
 RestartSec=0
 
 [Install]
+WantedBy=dev-virtio\x2dports-org.qemu.guest_agent.0.device
-- 
2.31.1