From 5d9b6723dd61f6e657d9b99647776e7269f92f250e2a81d6ba1555946d0cde56 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Wed, 13 Nov 2019 18:07:55 +0000
Subject: [PATCH] Accepting request 748458 from
 home:jfehlig:branches:Virtualization

- spec: Forcibly remove '--listen' option from LIBVIRTD_ARGS in
  /etc/sysconfig/libvirtd since it is incompatible with socket
  activation. Also add '--timeout' option for consistency with
  upstream.
  boo#1156161

OBS-URL: https://build.opensuse.org/request/show/748458
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=782
---
 libvirt.changes |  9 +++++++++
 libvirt.spec    | 44 ++++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/libvirt.changes b/libvirt.changes
index 36919df..24da8af 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 12 22:51:54 UTC 2019 - James Fehlig <jfehlig@suse.com>
+
+- spec: Forcibly remove '--listen' option from LIBVIRTD_ARGS in
+  /etc/sysconfig/libvirtd since it is incompatible with socket
+  activation. Also add '--timeout' option for consistency with
+  upstream.
+  boo#1156161
+
 -------------------------------------------------------------------
 Mon Nov 11 23:32:43 UTC 2019 - James Fehlig <jfehlig@suse.com>
 
diff --git a/libvirt.spec b/libvirt.spec
index 46737c2..efec269 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1003,21 +1003,25 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 
 %define arg_selinux_mount --with-selinux-mount="/selinux"
 
-# x86_64 UEFI firmwares
-# To more closely resemble actual hardware, we use the firmwares with
-# embedded Microsoft keys
-#
-# The Windows HCK test requires a bigger variable store, so 4MB firmware
-# images have been introduced. They are advertised first and will be
-# used by default for new VM installations. The 2MB images are still
-# available for existing VMs, and can be selected for new installations
-# as well.
-LOADERS="/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin:/usr/share/qemu/ovmf-x86_64-smm-ms-vars.bin"
-LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin"
-LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
-# aarch64 UEFI firmwares
-LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
-%define arg_loader_nvram --with-loader-nvram="$LOADERS"
+# UEFI firmwares
+# For SLE15 SP2 (Leap 15.2) and newer, use firmware descriptor files from the
+# firmware packages, otherwise define firmwares via configure option
+%if ! (0%{?suse_version} > 1500 || 0%{?sle_version} > 150100)
+    # x86_64 UEFI firmwares
+    # To more closely resemble actual hardware, we use the firmwares with
+    # embedded Microsoft keys
+    #
+    # The Windows HCK test requires a bigger variable store, so 4MB firmware
+    # images have been introduced. They are advertised first and will be
+    # used by default for new VM installations. The 2MB images are still
+    # available for existing VMs, and can be selected for new installations
+    # as well.
+    LOADERS="/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin"
+    LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin"
+    # aarch64 UEFI firmwares
+    LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
+    %define arg_loader_nvram --with-loader-nvram="$LOADERS"
+%endif
 
 autoreconf -f -i
 export CFLAGS="%{optflags}"
@@ -1253,6 +1257,14 @@ fi
 %{fillup_only -n libvirtd}
 %{fillup_only -n virtlockd}
 %{fillup_only -n virtlogd}
+# The '--listen' option is incompatible with socket activation.
+# We need to forcibly remove it from /etc/sysconfig/libvirtd.
+# Also add the --timeout option to be consistent with upstream.
+# See boo#1156161 for details
+sed -i -e '/^\s*LIBVIRTD_ARGS=/s/--listen//g' %{_sysconfdir}/sysconfig/libvirtd
+if ! grep -q -E '^\s*LIBVIRTD_ARGS=.*--timeout' %{_sysconfdir}/sysconfig/libvirtd ; then
+    sed -i 's/^\s*LIBVIRTD_ARGS="\(.*\)"/LIBVIRTD_ARGS="\1 --timeout 120"/' %{_sysconfdir}/sysconfig/libvirtd
+fi
 
 %preun daemon
 %service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
@@ -1272,7 +1284,7 @@ fi
 # All connection drivers should be installed post transaction.
 # Time to restart libvirtd. With new socket activation we need to be a bit
 # smarter on update. Old libvirtd owns the sockets and will delete them on
-# shutdown. We can't use try-restart as libvirtd will one the sockets again
+# shutdown. We can't use try-restart as libvirtd will own the sockets again
 # after restart. So we must instead shutdown libvirtd, start the sockets,
 # then start libvirtd.
 if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then