Skip to contentSkip to conversation

contrib: qemu-guest-agent.service updates

PATCH New Cole Robinson 1 participant 5 messages Jul 8, 2021

lore
Share & tools
lore
#1 lore raw

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

In reply to Cole Robinson

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

---
 contrib/systemd/qemu-guest-agent.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/systemd/qemu-guest-agent.service +1 -1
index 51cd7b37ff..59f7ecb1b8 100644
@@ -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]
Signature · 1 line
2.31.1
#0 lore raw

cover contrib: qemu-guest-agent.service updates

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(-)
Signature · 1 line
2.31.1
#2 lore raw

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

OpenSUSE adds this to their service file

---
 contrib/systemd/qemu-guest-agent.service | 1 +
 1 file changed, 1 insertion(+)
contrib/systemd/qemu-guest-agent.service +1 -0
index 59f7ecb1b8..7e1c50577b 100644
@@ -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
 
Signature · 1 line
2.31.1
#4 lore raw

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

In reply to 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

---
 contrib/systemd/qemu-guest-agent.service | 2 ++
 1 file changed, 2 insertions(+)
contrib/systemd/qemu-guest-agent.service +2 -0
index 505636a5ba..bb419fe55f 100644
@@ -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
Signature · 1 line
2.31.1
#3 lore raw

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

In reply to 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.

---
 contrib/systemd/qemu-guest-agent.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/systemd/qemu-guest-agent.service +1 -1
index 7e1c50577b..505636a5ba 100644
@@ -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
 
Signature · 1 line
2.31.1