From 643d32ed8f9b7f00982ec54f3de4af081aa41825234cf7e3511259f0458ad753 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 29 Jan 2021 04:47:06 +0000 Subject: [PATCH] Accepting request 867611 from home:lin_ma:branches:Virtualization Use '%service_del_postun_without_restart' instead of '%service_del_postun' (bsc#1178565) OBS-URL: https://build.opensuse.org/request/show/867611 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=609 --- qemu.changes | 7 +++++++ qemu.spec | 7 ++++++- qemu.spec.in | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/qemu.changes b/qemu.changes index cca78b8..a2fd176 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 29 02:47:35 UTC 2021 - Lin Ma + +- Use '%service_del_postun_without_restart' instead of '%service_del_postun' +to avoid "Failed to try-restart qemu-ga@.service" error while updating the +qemu-guest-agent. (bsc#1178565) + ------------------------------------------------------------------- Tue Jan 26 17:52:09 UTC 2021 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 090b5f6..d148c3d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1759,7 +1759,12 @@ if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then fi %postun guest-agent -%service_del_postun qemu-ga@.service +%service_del_postun_without_restart qemu-ga@.service +if [ "$1" = "1" ] ; then + if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then + /usr/bin/systemctl restart qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || : + fi +fi %pre ksm %service_add_pre ksm.service diff --git a/qemu.spec.in b/qemu.spec.in index b447e47..0b36f5a 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -1618,7 +1618,12 @@ if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then fi %postun guest-agent -%service_del_postun qemu-ga@.service +%service_del_postun_without_restart qemu-ga@.service +if [ "$1" = "1" ] ; then + if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then + /usr/bin/systemctl restart qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || : + fi +fi %pre ksm %service_add_pre ksm.service