SHA256
1
0
forked from pool/libvirt

Accepting request 867768 from home:jfehlig:branches:Virtualization

- Revert "Add libvirtd dependency to virt-guest-shutdown.target"
  32c5e432-revert-f035f53b.patch
  bsc#1177902

- spec: Enable the libvirt firewalld zone in SLE >= 15 SP3
  jsc#SLE-17336

OBS-URL: https://build.opensuse.org/request/show/867768
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=872
This commit is contained in:
James Fehlig 2021-01-29 18:23:22 +00:00 committed by Git OBS Bridge
parent 4e130a6e0c
commit b23d6f9e93
3 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,27 @@
commit 32c5e432044689b6679cdedeb1026f27653449d8
Author: Jim Fehlig <jfehlig@suse.com>
Date: Thu Jan 28 12:09:18 2021 -0700
Revert "remote: Add libvirtd dependency to virt-guest-shutdown.target"
Further testing revealed commit f035f53baa regresses Debian bug 955216
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955216
Restarting libvirt-guests on libvirtd restart is worse than the original
dependency issue, so revert the commit until a better solution is found.
This reverts commit f035f53baa2e5dc00b8e866e594672a90b4cea78.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Index: libvirt-7.0.0/src/remote/virt-guest-shutdown.target
===================================================================
--- libvirt-7.0.0.orig/src/remote/virt-guest-shutdown.target
+++ libvirt-7.0.0/src/remote/virt-guest-shutdown.target
@@ -1,4 +1,3 @@
[Unit]
Description=Libvirt guests shutdown
-Requires=libvirtd.service
Documentation=https://libvirt.org

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jan 29 17:54:25 UTC 2021 - James Fehlig <jfehlig@suse.com>
- Revert "Add libvirtd dependency to virt-guest-shutdown.target"
32c5e432-revert-f035f53b.patch
bsc#1177902
-------------------------------------------------------------------
Fri Jan 29 01:27:36 UTC 2021 - James Fehlig <jfehlig@suse.com>
- spec: Enable the libvirt firewalld zone in SLE >= 15 SP3
jsc#SLE-17336
-------------------------------------------------------------------
Tue Jan 19 02:12:11 UTC 2021 - James Fehlig <jfehlig@suse.com>

View File

@ -76,7 +76,7 @@
%endif
# The 'libvirt' zone must be used with firewalld >= 0.7.0
%if 0%{?suse_version} >= 1550
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
%define with_firewalld_zone 1
%endif
@ -291,6 +291,7 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: 32c5e432-revert-f035f53b.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch