Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 22f996f8f4 | |||
| da598118cf | |||
| da34e517db | |||
| 7b17ccd035 | |||
| 908a2f2a46 | |||
| acf19787de | |||
| c269619b9a | |||
| 3f6336f446 | |||
| a552a10ec8 | |||
| bfb8157052 | |||
| edb5200d83 | |||
| fe3f90dedd | |||
| 437df85540 | |||
| 2d6cbe6672 | |||
| 97a323d7c2 |
@@ -0,0 +1,48 @@
|
||||
From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
|
||||
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Date: Tue, 1 Mar 2022 18:47:59 +0100
|
||||
Subject: [PATCH] qemu: segmentation fault in virtqemud executing
|
||||
qemuDomainUndefineFlags
|
||||
|
||||
Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
|
||||
|
||||
Stack trace of thread 664419:
|
||||
#0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
|
||||
#1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
|
||||
#2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
|
||||
at src/remote/remote_daemon_dispatch_stubs.h:13080
|
||||
#3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
|
||||
at src/remote/remote_daemon_dispatch_stubs.h:13059
|
||||
#4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
|
||||
at ../src/rpc/virnetserverprogram.c:428
|
||||
#5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
|
||||
#6 0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
|
||||
#7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
|
||||
#8 0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
|
||||
#9 0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
|
||||
#10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
|
||||
#11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
|
||||
|
||||
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||||
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
|
||||
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
---
|
||||
src/qemu/qemu_driver.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
||||
index bcd9bdb436..8337eed510 100644
|
||||
--- a/src/qemu/qemu_driver.c
|
||||
+++ b/src/qemu/qemu_driver.c
|
||||
@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
|
||||
}
|
||||
}
|
||||
|
||||
- if (vm->def->os.loader->nvram) {
|
||||
+ if (vm->def->os.loader && vm->def->os.loader->nvram) {
|
||||
nvram_path = g_strdup(vm->def->os.loader->nvram);
|
||||
} else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
|
||||
qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
From 88c5b9f827779ae6fe5a6f08100a4b6184492a1c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 31 Aug 2021 10:59:39 +0100
|
||||
Subject: [PATCH] qemu, xen: add missing deps on virtlockd/virtlogd sockets
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The QEMU driver uses both virtlogd and virtlockd, while the Xen driver
|
||||
uses virtlockd. The libvirtd.service unit contains deps on the socket
|
||||
units for these services, but these deps were missed in the modular
|
||||
daemons. As a result the virtlockd/virtlogd sockets are not started
|
||||
when the virtqemud/virtxend daemons are started.
|
||||
|
||||
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
src/libxl/virtxend.service.in | 2 ++
|
||||
src/qemu/virtqemud.service.in | 4 ++++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
|
||||
index a863917467..19b19ce3e6 100644
|
||||
--- a/src/libxl/virtxend.service.in
|
||||
+++ b/src/libxl/virtxend.service.in
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=Virtualization xen daemon
|
||||
Conflicts=libvirtd.service
|
||||
+Requires=virtlockd.socket
|
||||
Requires=virtxend.socket
|
||||
Requires=virtxend-ro.socket
|
||||
Requires=virtxend-admin.socket
|
||||
@@ -25,6 +26,7 @@ KillMode=process
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
+Also=virtlockd.socket
|
||||
Also=virtxend.socket
|
||||
Also=virtxend-ro.socket
|
||||
Also=virtxend-admin.socket
|
||||
diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
|
||||
index 8abc9d3a7f..20e1b43a6e 100644
|
||||
--- a/src/qemu/virtqemud.service.in
|
||||
+++ b/src/qemu/virtqemud.service.in
|
||||
@@ -1,6 +1,8 @@
|
||||
[Unit]
|
||||
Description=Virtualization qemu daemon
|
||||
Conflicts=libvirtd.service
|
||||
+Requires=virtlogd.socket
|
||||
+Requires=virtlockd.socket
|
||||
Requires=virtqemud.socket
|
||||
Requires=virtqemud-ro.socket
|
||||
Requires=virtqemud-admin.socket
|
||||
@@ -42,6 +44,8 @@ LimitMEMLOCK=64M
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
+Also=virtlogd.socket
|
||||
+Also=virtlockd.socket
|
||||
Also=virtqemud.socket
|
||||
Also=virtqemud-ro.socket
|
||||
Also=virtqemud-admin.socket
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
From 7e299ba649b1288d529c7595c0e6060c9ae0ff2a Mon Sep 17 00:00:00 2001
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 29 Nov 2021 09:57:49 +0100
|
||||
Subject: [PATCH 1/2] wireshark: Switch to tvb_bytes_to_str()
|
||||
|
||||
When the dissector sees a byte sequence that is either an opaque
|
||||
data (xdr_opaque) or a byte sequence (xdr_bytes) it formats the
|
||||
bytes as a hex numbers using our own implementation. But
|
||||
wireshark already provides a function for it: tvb_bytes_to_str().
|
||||
NB, the reason why it returns a const string is so that callers
|
||||
don't try to free it - the string is allocated using an allocator
|
||||
which will decide when to free it.
|
||||
|
||||
The wireshark formatter was introduced in wireshark commit of
|
||||
v1.99.2~479 and thus is present in the version we require at
|
||||
least (2.6.0).
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
tools/wireshark/src/packet-libvirt.c | 30 ++++++++--------------------
|
||||
1 file changed, 8 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
|
||||
index f43919b05d..cb922b8070 100644
|
||||
--- a/tools/wireshark/src/packet-libvirt.c
|
||||
+++ b/tools/wireshark/src/packet-libvirt.c
|
||||
@@ -158,24 +158,6 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
|
||||
}
|
||||
}
|
||||
|
||||
-static const gchar *
|
||||
-format_xdr_bytes(guint8 *bytes, guint32 length)
|
||||
-{
|
||||
- gchar *buf;
|
||||
- guint32 i;
|
||||
-
|
||||
- if (length == 0)
|
||||
- return "";
|
||||
- buf = wmem_alloc(wmem_packet_scope(), length*2 + 1);
|
||||
- for (i = 0; i < length; i++) {
|
||||
- /* We know that buf has enough size to contain
|
||||
- 2 * length + '\0' characters. */
|
||||
- g_snprintf(buf, 2*(length - i) + 1, "%02x", bytes[i]);
|
||||
- buf += 2;
|
||||
- }
|
||||
- return buf - length*2;
|
||||
-}
|
||||
-
|
||||
static gboolean
|
||||
dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
|
||||
guint32 size)
|
||||
@@ -187,8 +169,10 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
|
||||
val = g_malloc(size);
|
||||
start = xdr_getpos(xdrs);
|
||||
if ((rc = xdr_opaque(xdrs, (caddr_t)val, size))) {
|
||||
- proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
|
||||
- NULL, "%s", format_xdr_bytes(val, size));
|
||||
+ gint len = xdr_getpos(xdrs) - start;
|
||||
+ const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
|
||||
+
|
||||
+ proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
|
||||
} else {
|
||||
proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
|
||||
}
|
||||
@@ -207,8 +191,10 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
|
||||
|
||||
start = xdr_getpos(xdrs);
|
||||
if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) {
|
||||
- proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
|
||||
- NULL, "%s", format_xdr_bytes(val, length));
|
||||
+ gint len = xdr_getpos(xdrs) - start;
|
||||
+ const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
|
||||
+
|
||||
+ proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
|
||||
/* Seems I can't call xdr_free() for this case.
|
||||
It will raises SEGV by referencing out of bounds call stack */
|
||||
free(val);
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 010613cfd8dae6d85602a84c5c95b2d441e1b3d1 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Privoznik <mprivozn@redhat.com>
|
||||
Date: Mon, 29 Nov 2021 10:20:05 +0100
|
||||
Subject: [PATCH 2/2] wireshark: Drop needless comment in dissect_xdr_bytes()
|
||||
|
||||
In the dissect_xdr_bytes() there's a comment that the string
|
||||
allocated by xdr_bytes() can't be freed using xdr_free(). Well,
|
||||
that is expected because xdr_bytes() used plain calloc() AND the
|
||||
string is not an XDR struct but plain 'char *' type. Passing it
|
||||
to xdr_free() must result in weird things happening.
|
||||
|
||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||||
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||||
---
|
||||
tools/wireshark/src/packet-libvirt.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
|
||||
index cb922b8070..eeacbcdf0e 100644
|
||||
--- a/tools/wireshark/src/packet-libvirt.c
|
||||
+++ b/tools/wireshark/src/packet-libvirt.c
|
||||
@@ -195,8 +195,6 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
|
||||
const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
|
||||
|
||||
proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
|
||||
- /* Seems I can't call xdr_free() for this case.
|
||||
- It will raises SEGV by referencing out of bounds call stack */
|
||||
free(val);
|
||||
return TRUE;
|
||||
} else {
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
From 979d1ba3ae1332bda80cb6eca98e41dc4462a226 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||||
Date: Tue, 31 Aug 2021 11:41:55 +0200
|
||||
Subject: [PATCH] tests: virstoragetest: remove tests without backing type
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
As of qemu commit:
|
||||
|
||||
commit 497a30dbb065937d67f6c43af6dd78492e1d6f6d
|
||||
qemu-img: Require -F with -b backing image
|
||||
|
||||
creating images with backing images requires specifying the format.
|
||||
|
||||
Remove tests which do not pass the backing format on the command
|
||||
line.
|
||||
|
||||
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||||
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
tests/virstoragetest.c | 33 ---------------------------------
|
||||
1 file changed, 33 deletions(-)
|
||||
|
||||
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
|
||||
index 1b211b60e6..b80818bc7b 100644
|
||||
--- a/tests/virstoragetest.c
|
||||
+++ b/tests/virstoragetest.c
|
||||
@@ -638,30 +638,6 @@ mymain(void)
|
||||
};
|
||||
TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2, &raw), EXP_PASS);
|
||||
|
||||
- /* Rewrite qcow2 and wrap file to omit backing file type */
|
||||
- virCommandFree(cmd);
|
||||
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
||||
- "-b", absraw, "qcow2", NULL);
|
||||
- if (virCommandRun(cmd, NULL) < 0)
|
||||
- ret = -1;
|
||||
-
|
||||
- virCommandFree(cmd);
|
||||
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
||||
- "-b", absqcow2, "wrap", NULL);
|
||||
- if (virCommandRun(cmd, NULL) < 0)
|
||||
- ret = -1;
|
||||
-
|
||||
- /* Qcow2 file with raw as absolute backing, backing format omitted */
|
||||
- testFileData wrap_as_raw = {
|
||||
- .expBackingStoreRaw = absqcow2,
|
||||
- .expCapacity = 1024,
|
||||
- .path = abswrap,
|
||||
- .type = VIR_STORAGE_TYPE_FILE,
|
||||
- .format = VIR_STORAGE_FILE_QCOW2,
|
||||
- };
|
||||
- TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2,
|
||||
- (&wrap_as_raw, &qcow2_as_raw), EXP_FAIL);
|
||||
-
|
||||
/* Rewrite qcow2 to a missing backing file, with backing type */
|
||||
virCommandFree(cmd);
|
||||
cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
||||
@@ -674,15 +650,6 @@ mymain(void)
|
||||
/* Qcow2 file with missing backing file but specified type */
|
||||
TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
|
||||
|
||||
- /* Rewrite qcow2 to a missing backing file, without backing type */
|
||||
- virCommandFree(cmd);
|
||||
- cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
|
||||
- "-b", datadir "/bogus", "qcow2", NULL);
|
||||
- if (virCommandRun(cmd, NULL) < 0)
|
||||
- ret = -1;
|
||||
-
|
||||
- /* Qcow2 file with missing backing file and no specified type */
|
||||
- TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
|
||||
|
||||
/* Rewrite qcow2 to use an nbd: protocol as backend */
|
||||
virCommandFree(cmd);
|
||||
--
|
||||
2.33.1
|
||||
|
||||
+176
-90
@@ -21,10 +21,13 @@
|
||||
%define arches_systemtap_64bit %{arches_64bit}
|
||||
%define arches_dmidecode %{arches_x86}
|
||||
%define arches_xen %{arches_x86} aarch64
|
||||
%if 0%{?fedora} >= 36
|
||||
%define arches_xen x86_64 aarch64
|
||||
%endif
|
||||
%define arches_vbox %{arches_x86}
|
||||
%define arches_ceph %{arches_64bit}
|
||||
%define arches_zfs %{arches_x86} %{power64} %{arm}
|
||||
%define arches_numactl %{arches_x86} %{power64} aarch64
|
||||
%define arches_numactl %{arches_x86} %{power64} aarch64 s390x
|
||||
%define arches_numad %{arches_x86} %{power64} aarch64
|
||||
|
||||
# The hypervisor drivers that run in libvirtd
|
||||
@@ -190,6 +193,10 @@
|
||||
%define qemu_user qemu
|
||||
%define qemu_group qemu
|
||||
|
||||
# Locations for QEMU data
|
||||
%define qemu_moddir %{_libdir}/qemu
|
||||
%define qemu_datadir %{_datadir}/qemu
|
||||
|
||||
|
||||
# RHEL releases provide stable tool chains and so it is safe to turn
|
||||
# compiler warning into errors without being worried about frequent
|
||||
@@ -202,11 +209,29 @@
|
||||
|
||||
%define tls_priority "@LIBVIRT,SYSTEM"
|
||||
|
||||
# libvirt 8.1.0 stops distributing any sysconfig files.
|
||||
# If the user has customized their sysconfig file,
|
||||
# the RPM upgrade path will rename it to .rpmsave
|
||||
# because the file is no longer managed by RPM.
|
||||
# To prevent a regression we rename it back after the
|
||||
# transaction to preserve the user's modifications
|
||||
%define libvirt_sysconfig_pre() \
|
||||
for sc in %{?*} ; do \
|
||||
test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \
|
||||
mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}.rpmsave.old" ; \
|
||||
done \
|
||||
%{nil}
|
||||
%define libvirt_sysconfig_posttrans() \
|
||||
for sc in %{?*} ; do \
|
||||
test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \
|
||||
mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}" ; \
|
||||
done \
|
||||
%{nil}
|
||||
|
||||
Summary: Library providing a simple virtualization API
|
||||
Name: libvirt
|
||||
Version: 7.6.0
|
||||
Release: 5%{?dist}
|
||||
Version: 8.1.0
|
||||
Release: 3%{?dist}
|
||||
License: LGPLv2+
|
||||
URL: https://libvirt.org/
|
||||
|
||||
@@ -214,10 +239,7 @@ URL: https://libvirt.org/
|
||||
%define mainturl stable_updates/
|
||||
%endif
|
||||
Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
|
||||
Patch1: 0001-qemu-xen-add-missing-deps-on-virtlockd-virtlogd-sock.patch
|
||||
Patch2: 0002-wireshark-Switch-to-tvb_bytes_to_str.patch
|
||||
Patch3: 0003-wireshark-Drop-needless-comment-in-dissect_xdr_bytes.patch
|
||||
Patch4: 0004-tests-virstoragetest-remove-tests-without-backing-ty.patch
|
||||
Patch: 0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
|
||||
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-daemon-config-network = %{version}-%{release}
|
||||
@@ -281,9 +303,7 @@ BuildRequires: sanlock-devel >= 2.4
|
||||
BuildRequires: libpcap-devel >= 1.5.0
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: dnsmasq >= 2.41
|
||||
BuildRequires: iptables
|
||||
BuildRequires: radvd
|
||||
BuildRequires: ebtables
|
||||
BuildRequires: module-init-tools
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
@@ -308,8 +328,6 @@ BuildRequires: libiscsi-devel
|
||||
BuildRequires: parted-devel
|
||||
# For Multipath support
|
||||
BuildRequires: device-mapper-devel
|
||||
# For XFS reflink clone support
|
||||
BuildRequires: xfsprogs-devel
|
||||
%if %{with_storage_rbd}
|
||||
BuildRequires: librados-devel
|
||||
BuildRequires: librbd-devel
|
||||
@@ -321,12 +339,6 @@ BuildRequires: glusterfs-devel >= 3.4.1
|
||||
%if %{with_storage_sheepdog}
|
||||
BuildRequires: sheepdog
|
||||
%endif
|
||||
%if %{with_storage_zfs}
|
||||
# Support any conforming implementation of zfs. On stock Fedora
|
||||
# this is zfs-fuse, but could be zfsonlinux upstream RPMs
|
||||
BuildRequires: /sbin/zfs
|
||||
BuildRequires: /sbin/zpool
|
||||
%endif
|
||||
%if %{with_numactl}
|
||||
# For QEMU/LXC numa info
|
||||
BuildRequires: numactl-devel
|
||||
@@ -403,8 +415,12 @@ Summary: Server side daemon and supporting files for libvirt library
|
||||
# The client side, i.e. shared libs are in a subpackage
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
# (client invokes 'nc' against the UNIX socket on the server)
|
||||
Requires: /usr/bin/nc
|
||||
# netcat is needed on the server side so that clients that have
|
||||
# libvirt < 6.9.0 can connect, but newer versions will prefer
|
||||
# virt-ssh-helper. Making this a Recommends means that it gets
|
||||
# installed by default, but can still be removed if compatibility
|
||||
# with old clients is not required
|
||||
Recommends: /usr/bin/nc
|
||||
|
||||
# for modprobe of pci devices
|
||||
Requires: module-init-tools
|
||||
@@ -464,7 +480,6 @@ Summary: Network driver plugin for the libvirtd daemon
|
||||
Requires: libvirt-daemon = %{version}-%{release}
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: dnsmasq >= 2.41
|
||||
Requires: radvd
|
||||
Requires: iptables
|
||||
|
||||
%description daemon-driver-network
|
||||
@@ -1164,6 +1179,8 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
%{arg_packager_version} \
|
||||
-Dqemu_user=%{qemu_user} \
|
||||
-Dqemu_group=%{qemu_group} \
|
||||
-Dqemu_moddir=%{qemu_moddir} \
|
||||
-Dqemu_datadir=%{qemu_datadir} \
|
||||
-Dtls_priority=%{tls_priority} \
|
||||
%{?enable_werror} \
|
||||
-Dexpensive_tests=enabled \
|
||||
@@ -1182,21 +1199,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
|
||||
|
||||
%meson_install
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a
|
||||
%if %{with_wireshark}
|
||||
rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la
|
||||
%endif
|
||||
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
|
||||
# We don't want to install /etc/libvirt/qemu/networks in the main %%files list
|
||||
# because if the admin wants to delete the default network completely, we don't
|
||||
# want to end up re-incarnating it on every RPM upgrade.
|
||||
@@ -1291,6 +1293,7 @@ fi \
|
||||
%define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket
|
||||
|
||||
%pre daemon
|
||||
%libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests
|
||||
# 'libvirt' group is just to allow password-less polkit access to
|
||||
# libvirtd. The uid number is irrelevant, so we use dynamic allocation
|
||||
# described at the above link.
|
||||
@@ -1339,6 +1342,7 @@ if [ $1 -ge 1 ] ; then
|
||||
fi
|
||||
|
||||
%posttrans daemon
|
||||
%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests
|
||||
if test %libvirt_daemon_needs_restart libvirtd
|
||||
then
|
||||
# See if user has previously modified their install to
|
||||
@@ -1379,6 +1383,9 @@ fi
|
||||
|
||||
%libvirt_daemon_finish_restart libvirtd
|
||||
|
||||
%pre daemon-driver-network
|
||||
%libvirt_sysconfig_pre virtnetworkd
|
||||
|
||||
%post daemon-driver-network
|
||||
%if %{with_firewalld_zone}
|
||||
%firewalld_reload
|
||||
@@ -1389,7 +1396,7 @@ fi
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtnetworkd
|
||||
|
||||
%preun
|
||||
%preun daemon-driver-network
|
||||
%libvirt_daemon_systemd_preun virtnetworkd
|
||||
|
||||
%postun daemon-driver-network
|
||||
@@ -1398,8 +1405,11 @@ fi
|
||||
%endif
|
||||
|
||||
%posttrans daemon-driver-network
|
||||
%libvirt_sysconfig_posttrans virtnetworkd
|
||||
%libvirt_daemon_perform_restart virtnetworkd
|
||||
|
||||
%pre daemon-driver-nwfilter
|
||||
%libvirt_sysconfig_pre virtnwfilterd
|
||||
|
||||
%post daemon-driver-nwfilter
|
||||
%if %{with_modular_daemons}
|
||||
@@ -1411,8 +1421,11 @@ fi
|
||||
%libvirt_daemon_systemd_preun virtnwfilterd
|
||||
|
||||
%posttrans daemon-driver-nwfilter
|
||||
%libvirt_sysconfig_posttrans virtnwfilterd
|
||||
%libvirt_daemon_perform_restart virtnwfilterd
|
||||
|
||||
%pre daemon-driver-nodedev
|
||||
%libvirt_sysconfig_pre virtnodedevd
|
||||
|
||||
%post daemon-driver-nodedev
|
||||
%if %{with_modular_daemons}
|
||||
@@ -1424,8 +1437,11 @@ fi
|
||||
%libvirt_daemon_systemd_preun virtnodedevd
|
||||
|
||||
%posttrans daemon-driver-nodedev
|
||||
%libvirt_sysconfig_posttrans virtnodedevd
|
||||
%libvirt_daemon_perform_restart virtnodedevd
|
||||
|
||||
%pre daemon-driver-interface
|
||||
%libvirt_sysconfig_pre virtinterfaced
|
||||
|
||||
%post daemon-driver-interface
|
||||
%if %{with_modular_daemons}
|
||||
@@ -1437,8 +1453,11 @@ fi
|
||||
%libvirt_daemon_systemd_preun virtinterfaced
|
||||
|
||||
%posttrans daemon-driver-interface
|
||||
%libvirt_sysconfig_posttrans virtinterfaced
|
||||
%libvirt_daemon_perform_restart virtinterfaced
|
||||
|
||||
%pre daemon-driver-secret
|
||||
%libvirt_sysconfig_pre virtsecretd
|
||||
|
||||
%post daemon-driver-secret
|
||||
%if %{with_modular_daemons}
|
||||
@@ -1450,78 +1469,112 @@ fi
|
||||
%libvirt_daemon_systemd_preun virtsecretd
|
||||
|
||||
%posttrans daemon-driver-secret
|
||||
%libvirt_sysconfig_posttrans virtsecretd
|
||||
%libvirt_daemon_perform_restart virtsecretd
|
||||
|
||||
|
||||
%post daemon-driver-storage
|
||||
%pre daemon-driver-storage-core
|
||||
%libvirt_sysconfig_pre virtstoraged
|
||||
|
||||
%post daemon-driver-storage-core
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post virtstoraged
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtstoraged
|
||||
|
||||
%preun daemon-driver-storage
|
||||
%preun daemon-driver-storage-core
|
||||
%libvirt_daemon_systemd_preun virtstoraged
|
||||
|
||||
%posttrans daemon-driver-storage
|
||||
%posttrans daemon-driver-storage-core
|
||||
%libvirt_sysconfig_posttrans virtstoraged
|
||||
%libvirt_daemon_perform_restart virtstoraged
|
||||
|
||||
|
||||
%if %{with_qemu}
|
||||
%pre daemon-driver-qemu
|
||||
%libvirt_sysconfig_pre virtqemud
|
||||
# We want soft static allocation of well-known ids, as disk images
|
||||
# are commonly shared across NFS mounts by id rather than name; see
|
||||
# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
|
||||
getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
|
||||
getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
|
||||
if ! getent passwd qemu >/dev/null; then
|
||||
if ! getent passwd 107 >/dev/null; then
|
||||
useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
|
||||
else
|
||||
useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
|
||||
%post daemon-driver-qemu
|
||||
%if %{with_modular_daemons}
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post virtqemud
|
||||
%endif
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtqemud
|
||||
|
||||
%preun daemon-driver-qemu
|
||||
%libvirt_daemon_systemd_preun virtqemud
|
||||
|
||||
%posttrans daemon-driver-qemu
|
||||
%libvirt_sysconfig_posttrans virtqemud
|
||||
%libvirt_daemon_perform_restart virtqemud
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_lxc}
|
||||
%pre daemon-driver-lxc
|
||||
%libvirt_sysconfig_pre virtlxcd
|
||||
|
||||
%post daemon-driver-lxc
|
||||
%if %{with_modular_daemons}
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post virtlxcd
|
||||
%endif
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtlxcd
|
||||
|
||||
%preun daemon-driver-lxc
|
||||
%libvirt_daemon_systemd_preun virtlxcd
|
||||
|
||||
%posttrans daemon-driver-lxc
|
||||
%libvirt_sysconfig_posttrans virtlxcd
|
||||
%libvirt_daemon_perform_restart virtlxcd
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_vbox}
|
||||
%post daemon-driver-vbox
|
||||
%if %{with_modular_daemons}
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post virtvboxd
|
||||
%endif
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtvboxd
|
||||
|
||||
%pre daemon-driver-vbox
|
||||
%libvirt_sysconfig_pre virtvboxd
|
||||
|
||||
%preun daemon-driver-vbox
|
||||
%libvirt_daemon_systemd_preun virtvboxd
|
||||
|
||||
%posttrans daemon-driver-vbox
|
||||
%libvirt_sysconfig_posttrans virtvboxd
|
||||
%libvirt_daemon_perform_restart virtvboxd
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with_libxl}
|
||||
%post daemon-driver-libxl
|
||||
%if %{with_modular_daemons}
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post virtxend
|
||||
%endif
|
||||
%endif
|
||||
%libvirt_daemon_schedule_restart virtxend
|
||||
|
||||
%pre daemon-driver-libxl
|
||||
%libvirt_sysconfig_pre virtxend
|
||||
|
||||
%preun daemon-driver-libxl
|
||||
%libvirt_daemon_systemd_preun virtxend
|
||||
|
||||
%posttrans daemon-driver-libxl
|
||||
%libvirt_sysconfig_posttrans virtxend
|
||||
%libvirt_daemon_perform_restart virtxend
|
||||
%endif
|
||||
|
||||
@@ -1588,23 +1641,6 @@ done
|
||||
%libvirt_daemon_perform_restart libvirtd
|
||||
%libvirt_daemon_perform_restart virtnwfilterd
|
||||
|
||||
%if %{with_qemu}
|
||||
%pre daemon-driver-qemu
|
||||
# We want soft static allocation of well-known ids, as disk images
|
||||
# are commonly shared across NFS mounts by id rather than name; see
|
||||
# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
|
||||
getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
|
||||
getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
|
||||
if ! getent passwd qemu >/dev/null; then
|
||||
if ! getent passwd 107 >/dev/null; then
|
||||
useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
|
||||
else
|
||||
useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
%endif
|
||||
|
||||
%if %{with_lxc}
|
||||
%pre login-shell
|
||||
getent group virtlogin >/dev/null || groupadd -r virtlogin
|
||||
@@ -1619,8 +1655,6 @@ exit 0
|
||||
|
||||
%files daemon
|
||||
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
|
||||
|
||||
%{_unitdir}/libvirtd.service
|
||||
%{_unitdir}/libvirtd.socket
|
||||
%{_unitdir}/libvirtd-ro.socket
|
||||
@@ -1641,23 +1675,20 @@ exit 0
|
||||
%{_unitdir}/virtlockd.socket
|
||||
%{_unitdir}/virtlockd-admin.socket
|
||||
%{_unitdir}/libvirt-guests.service
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
|
||||
%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
||||
%dir %{_datadir}/libvirt/
|
||||
|
||||
%ghost %dir %{_rundir}/libvirt/
|
||||
%ghost %dir %{_rundir}/libvirt/common/
|
||||
|
||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
|
||||
%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
|
||||
@@ -1700,6 +1731,8 @@ exit 0
|
||||
|
||||
%{_mandir}/man1/virt-admin.1*
|
||||
%{_mandir}/man1/virt-host-validate.1*
|
||||
%{_mandir}/man8/virt-ssh-helper.8*
|
||||
%{_mandir}/man8/libvirt-guests.8*
|
||||
%{_mandir}/man8/libvirtd.8*
|
||||
%{_mandir}/man8/virtlogd.8*
|
||||
%{_mandir}/man8/virtlockd.8*
|
||||
@@ -1722,7 +1755,6 @@ exit 0
|
||||
%ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
|
||||
|
||||
%files daemon-driver-interface
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtinterfaced
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf
|
||||
%{_datadir}/augeas/lenses/virtinterfaced.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
|
||||
@@ -1731,11 +1763,11 @@ exit 0
|
||||
%{_unitdir}/virtinterfaced-ro.socket
|
||||
%{_unitdir}/virtinterfaced-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtinterfaced
|
||||
%ghost %dir %{_rundir}/libvirt/interface/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
|
||||
%{_mandir}/man8/virtinterfaced.8*
|
||||
|
||||
%files daemon-driver-network
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtnetworkd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf
|
||||
%{_datadir}/augeas/lenses/virtnetworkd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
|
||||
@@ -1759,7 +1791,6 @@ exit 0
|
||||
%endif
|
||||
|
||||
%files daemon-driver-nodedev
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtnodedevd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf
|
||||
%{_datadir}/augeas/lenses/virtnodedevd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
|
||||
@@ -1768,11 +1799,11 @@ exit 0
|
||||
%{_unitdir}/virtnodedevd-ro.socket
|
||||
%{_unitdir}/virtnodedevd-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtnodedevd
|
||||
%ghost %dir %{_rundir}/libvirt/nodedev/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
|
||||
%{_mandir}/man8/virtnodedevd.8*
|
||||
|
||||
%files daemon-driver-nwfilter
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtnwfilterd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf
|
||||
%{_datadir}/augeas/lenses/virtnwfilterd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
|
||||
@@ -1783,11 +1814,12 @@ exit 0
|
||||
%attr(0755, root, root) %{_sbindir}/virtnwfilterd
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
|
||||
%ghost %dir %{_rundir}/libvirt/network/
|
||||
%ghost %dir %{_rundir}/libvirt/nwfilter-binding/
|
||||
%ghost %dir %{_rundir}/libvirt/nwfilter/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
|
||||
%{_mandir}/man8/virtnwfilterd.8*
|
||||
|
||||
%files daemon-driver-secret
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtsecretd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf
|
||||
%{_datadir}/augeas/lenses/virtsecretd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
|
||||
@@ -1796,13 +1828,14 @@ exit 0
|
||||
%{_unitdir}/virtsecretd-ro.socket
|
||||
%{_unitdir}/virtsecretd-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtsecretd
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/
|
||||
%ghost %dir %{_rundir}/libvirt/secrets/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
|
||||
%{_mandir}/man8/virtsecretd.8*
|
||||
|
||||
%files daemon-driver-storage
|
||||
|
||||
%files daemon-driver-storage-core
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtstoraged
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf
|
||||
%{_datadir}/augeas/lenses/virtstoraged.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
|
||||
@@ -1812,6 +1845,9 @@ exit 0
|
||||
%{_unitdir}/virtstoraged-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtstoraged
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/
|
||||
%ghost %dir %{_rundir}/libvirt/storage/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
|
||||
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
|
||||
%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
|
||||
@@ -1860,8 +1896,8 @@ exit 0
|
||||
|
||||
%if %{with_qemu}
|
||||
%files daemon-driver-qemu
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
|
||||
%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
|
||||
%{_datadir}/augeas/lenses/virtqemud.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
|
||||
%{_unitdir}/virtqemud.service
|
||||
@@ -1870,13 +1906,25 @@ exit 0
|
||||
%{_unitdir}/virtqemud-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtqemud
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/autostart/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/dbus/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/slirp/
|
||||
%ghost %dir %{_rundir}/libvirt/qemu/swtpm/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ram/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/save/
|
||||
%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/snapshot/
|
||||
%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/
|
||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
|
||||
@@ -1889,7 +1937,6 @@ exit 0
|
||||
|
||||
%if %{with_lxc}
|
||||
%files daemon-driver-lxc
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtlxcd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
|
||||
%{_datadir}/augeas/lenses/virtlxcd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
|
||||
@@ -1899,6 +1946,8 @@ exit 0
|
||||
%{_unitdir}/virtlxcd-admin.socket
|
||||
%attr(0755, root, root) %{_sbindir}/virtlxcd
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/autostart/
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
|
||||
%ghost %dir %{_rundir}/libvirt/lxc/
|
||||
@@ -1912,7 +1961,6 @@ exit 0
|
||||
|
||||
%if %{with_libxl}
|
||||
%files daemon-driver-libxl
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtxend
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
|
||||
%{_datadir}/augeas/lenses/virtxend.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtxend.aug
|
||||
@@ -1924,18 +1972,23 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/autostart/
|
||||
%{_datadir}/augeas/lenses/libvirtd_libxl.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
|
||||
%ghost %dir %{_rundir}/libvirt/libxl/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/
|
||||
%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
|
||||
%{_mandir}/man8/virtxend.8*
|
||||
%endif
|
||||
|
||||
%if %{with_vbox}
|
||||
%files daemon-driver-vbox
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
|
||||
%{_datadir}/augeas/lenses/virtvboxd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
|
||||
@@ -1988,15 +2041,18 @@ exit 0
|
||||
%files client
|
||||
%{_mandir}/man1/virsh.1*
|
||||
%{_mandir}/man1/virt-xml-validate.1*
|
||||
%{_mandir}/man1/virt-pki-query-dn.1*
|
||||
%{_mandir}/man1/virt-pki-validate.1*
|
||||
%{_bindir}/virsh
|
||||
%{_bindir}/virt-xml-validate
|
||||
%{_bindir}/virt-pki-query-dn
|
||||
%{_bindir}/virt-pki-validate
|
||||
|
||||
%{_datadir}/bash-completion/completions/virsh
|
||||
|
||||
%files libs -f %{name}.lang
|
||||
%license COPYING COPYING.LESSER
|
||||
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
|
||||
%{_libdir}/libvirt.so.*
|
||||
@@ -2005,7 +2061,6 @@ exit 0
|
||||
%{_libdir}/libvirt-admin.so.*
|
||||
%dir %{_datadir}/libvirt/
|
||||
%dir %{_datadir}/libvirt/schemas/
|
||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
|
||||
|
||||
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
|
||||
%{_datadir}/systemtap/tapset/libvirt_functions.stp
|
||||
@@ -2073,15 +2128,46 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.6.0-5
|
||||
- Fix mistakes in post scripts causing uninstall errors
|
||||
* Sat Jun 11 2022 Cole Robinson <crobinso@redhat.com> - 8.1.0-3
|
||||
- Adjust for Xen dropping 32bit arches
|
||||
|
||||
* Mon Dec 13 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.6.0-4
|
||||
- Rebuild for changed wireshark soname (rhbz#2031316)
|
||||
* Thu Mar 3 2022 Daniel P. Berrangé <berrange@redhat.com> - 8.1.0-2
|
||||
- Fix crash undefining VM without loader (rhbz#2060412)
|
||||
|
||||
* Wed Sep 8 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.6.0-3
|
||||
- Fix bad post transaction script tag
|
||||
- Fix deps on virtlockd/virtlogd socket units (rhbz#2002279)
|
||||
* Tue Mar 01 2022 Cole Robinson <crobinso@redhat.com> - 8.1.0-1
|
||||
- Update to version 8.1.0
|
||||
|
||||
* Tue Feb 22 2022 Richard W.M. Jones <rjones@redhat.com> - 8.0.0-3
|
||||
- Include upstream patch which fixes virt-install bug.
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jan 14 2022 Cole Robinson <crobinso@redhat.com> - 8.0.0-1
|
||||
- Update to version 8.0.0
|
||||
|
||||
* Tue Jan 11 2022 Richard W.M. Jones <rjones@redhat.com> - 7.10.0-2
|
||||
- Bump release and rebuild for new xen
|
||||
|
||||
* Wed Dec 1 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.10.0-1
|
||||
- Update to 7.10.0 release
|
||||
|
||||
* Tue Nov 2 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.9.0-1
|
||||
- Update to 7.9.0 release
|
||||
|
||||
* Thu Oct 28 2021 Richard W.M. Jones <rjones@redhat.com> - 7.8.0-2
|
||||
- Bump and rebuild for fixed glusterfs on arm (RHBZ#2018182)
|
||||
|
||||
* Fri Oct 1 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.8.0-1
|
||||
- Update to 7.8.0 release
|
||||
|
||||
* Thu Sep 2 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.7.0-1
|
||||
- Update to 7.7.0 release
|
||||
|
||||
* Tue Aug 31 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.6.0-3
|
||||
- Fix repeated word in scriptlet name
|
||||
- Fix deps on virtlockd/virtlogd socket units
|
||||
- Fix test failure with newer QEMU
|
||||
|
||||
* Wed Aug 4 2021 Daniel P. Berrangé <berrange@redhat.com> - 7.6.0-2
|
||||
- Switch to use modular daemons by default
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (libvirt-7.6.0.tar.xz) = bad6cc02af071ca909bbbe3c07165e91cad863c9a759b26d9cff6aed6ea5643bc723d2f3c61ad41436dffd4fd50389333d74b131e37eaa54a5071a3ae26df627
|
||||
SHA512 (libvirt-8.1.0.tar.xz) = 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97
|
||||
|
||||
Reference in New Issue
Block a user