rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

Accepting request 748458 from home:jfehlig:branches:Virtualization

Browse Source 
- 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
This commit is contained in:
James Fehlig 2019-11-13 18:07:55 +00:00 committed by Git OBS Bridge
parent 14a0b75e7d
commit 5d9b6723dd
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libvirt.changes
View File

@ -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> Mon Nov 11 23:32:43 UTC 2019 - James Fehlig <jfehlig@suse.com>

44
libvirt.spec
View File

@ -1003,21 +1003,25 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%define arg_selinux_mount --with-selinux-mount="/selinux" %define arg_selinux_mount --with-selinux-mount="/selinux"
# x86_64 UEFI firmwares # UEFI firmwares
# To more closely resemble actual hardware, we use the firmwares with # For SLE15 SP2 (Leap 15.2) and newer, use firmware descriptor files from the
# embedded Microsoft keys # firmware packages, otherwise define firmwares via configure option
# %if ! (0%{?suse_version} > 1500 || 0%{?sle_version} > 150100)
# The Windows HCK test requires a bigger variable store, so 4MB firmware # x86_64 UEFI firmwares
# images have been introduced. They are advertised first and will be # To more closely resemble actual hardware, we use the firmwares with
# used by default for new VM installations. The 2MB images are still # embedded Microsoft keys
# available for existing VMs, and can be selected for new installations #
# as well. # The Windows HCK test requires a bigger variable store, so 4MB firmware
LOADERS="/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin:/usr/share/qemu/ovmf-x86_64-smm-ms-vars.bin" # images have been introduced. They are advertised first and will be
LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin" # used by default for new VM installations. The 2MB images are still
LOADERS="$LOADERS:/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" # available for existing VMs, and can be selected for new installations
# aarch64 UEFI firmwares # as well.
LOADERS="$LOADERS:/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" LOADERS="/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin"
%define arg_loader_nvram --with-loader-nvram="$LOADERS" 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 autoreconf -f -i
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
@ -1253,6 +1257,14 @@ fi
%{fillup_only -n libvirtd} %{fillup_only -n libvirtd}
%{fillup_only -n virtlockd} %{fillup_only -n virtlockd}
%{fillup_only -n virtlogd} %{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 %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 %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. # All connection drivers should be installed post transaction.
# Time to restart libvirtd. With new socket activation we need to be a bit # 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 # 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, # after restart. So we must instead shutdown libvirtd, start the sockets,
# then start libvirtd. # then start libvirtd.
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then