External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

spec: Rename the libvirt-lock-sanlock subpackage

Browse Source 
The new name "libvirt-daemon-plugin-sanlock" provides consistency with the
newly introduced "libvirt-daemon-plugin-lockd" subpackage.

It's also a good opportunity to taking ownership of
%{_libdir}/libvirt/lock-driver/, removing the need for a dependency on the
libvirt-daemon package.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jim Fehlig 2022-12-13 17:30:58 -07:00
parent 4b9f13eb51
commit 33772e1fcc
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/kbase/rpm-deployment.rst
View File

@ -289,6 +289,12 @@ RPM packages
features, the subset of libvirt-daemon-driver-XXX packages should be used
instead.
* libvirt-daemon-plugin-sanlock
This package provides the sanlock.so module, a daemon plugin that implements
disk locking via communication with the sanlock daemon. It is optional and
only relevant to hosts with the QEMU driver and oVirt management application.
* libvirt-daemon-qemu
This is an empty package that exists only as a convenient way to request
@ -352,12 +358,6 @@ RPM packages
take to the libvirt daemons to utilize stateful drivers (QEMU, Xen, BHyve,
LXC, VZ, etc). This is needed on all libvirt hosts, both client and server.
* libvirt-lock-sanlock
A plugin for locking disks that communicates with the sanlock daemon. It is
optional and only relevant to hosts with the QEMU driver and oVirt management
application.
* libvirt-login-shell
A simple login shell that automatically spawns an LXC container for the user

11
libvirt.spec.in
View File

@ -962,15 +962,16 @@ Requires: pkgconfig
Include header files & development libraries for the libvirt C library.
%if %{with_sanlock}
%package lock-sanlock
%package daemon-plugin-sanlock
Summary: Sanlock lock manager plugin for QEMU driver
Requires: sanlock >= 2.4
#for virt-sanlock-cleanup require augeas
Requires: augeas
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Obsoletes: libvirt-lock-sanlock < 9.1.0
Provides: libvirt-lock-sanlock = %{version}-%{release}
%description lock-sanlock
%description daemon-plugin-sanlock
Includes the Sanlock lock manager plugin for the QEMU
driver
%endif
@ -1829,7 +1830,6 @@ exit 0
%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
%dir %attr(0755, root, root) %{_libdir}/libvirt/
%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
%{_datadir}/augeas/lenses/libvirtd.aug
@ -2170,13 +2170,14 @@ exit 0
%endif
%if %{with_sanlock}
%files lock-sanlock
%files daemon-plugin-sanlock
%if %{with_qemu}
%config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
%endif
%if %{with_libxl}
%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
%endif
%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
%{_datadir}/augeas/lenses/libvirt_sanlock.aug
%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug