mirror of https://gitee.com/openkylin/libvirt.git
spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy
Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Jim Fehlig
parent
b19b817f5a
commit
b1da03b5b3
|
|
@ -434,17 +434,12 @@ Summary: Server side daemon and supporting files for libvirt library
|
|||
Requires: libvirt-libs = %{version}-%{release}
|
||||
Requires: libvirt-daemon-lock = %{version}-%{release}
|
||||
Requires: libvirt-daemon-log = %{version}-%{release}
|
||||
Requires: libvirt-daemon-proxy = %{version}-%{release}
|
||||
# The libvirt-guests.sh script requires virsh from libvirt-client subpackage,
|
||||
# but not every deployment wants to use libvirt-guests service. Using
|
||||
# Recommends here will install libvirt-client by default (if available), but
|
||||
# RPM won't complain if the package is unavailable, masked, or removed later.
|
||||
Recommends: libvirt-client = %{version}-%{release}
|
||||
# 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
|
||||
# for /sbin/ip
|
||||
|
|
@ -497,6 +492,20 @@ Requires: libvirt-libs = %{version}-%{release}
|
|||
%description daemon-log
|
||||
Server side daemon used to manage logs from virtual machine consoles
|
||||
|
||||
%package daemon-proxy
|
||||
Summary: Server side daemon providing libvirtd proxy
|
||||
Requires: libvirt-libs = %{version}-%{release}
|
||||
# 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
|
||||
|
||||
%description daemon-proxy
|
||||
Server side daemon providing functionality previously provided by
|
||||
the monolithic libvirtd
|
||||
|
||||
%package daemon-config-network
|
||||
Summary: Default configuration files for the libvirtd daemon
|
||||
|
||||
|
|
@ -1415,7 +1424,7 @@ fi \
|
|||
%define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket
|
||||
|
||||
%pre daemon
|
||||
%libvirt_sysconfig_pre libvirtd virtproxyd libvirt-guests
|
||||
%libvirt_sysconfig_pre libvirtd 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.
|
||||
|
|
@ -1423,9 +1432,7 @@ getent group libvirt >/dev/null || groupadd -r libvirt
|
|||
exit 0
|
||||
|
||||
%post daemon
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post_inet virtproxyd
|
||||
%else
|
||||
%if ! %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post_inet libvirtd
|
||||
%endif
|
||||
%systemd_post libvirt-guests.service
|
||||
|
|
@ -1434,14 +1441,13 @@ exit 0
|
|||
%preun daemon
|
||||
%systemd_preun libvirt-guests.service
|
||||
%libvirt_daemon_systemd_preun_inet libvirtd
|
||||
%libvirt_daemon_systemd_preun_inet virtproxyd
|
||||
|
||||
%postun daemon
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
%systemd_postun libvirt-guests.service
|
||||
|
||||
%posttrans daemon
|
||||
%libvirt_sysconfig_posttrans libvirtd virtproxyd libvirt-guests
|
||||
%libvirt_sysconfig_posttrans libvirtd libvirt-guests
|
||||
if test %libvirt_daemon_needs_restart libvirtd
|
||||
then
|
||||
# See if user has previously modified their install to
|
||||
|
|
@ -1512,6 +1518,20 @@ fi
|
|||
%posttrans daemon-log
|
||||
%libvirt_sysconfig_posttrans virtlogd
|
||||
|
||||
%pre daemon-proxy
|
||||
%libvirt_sysconfig_pre virtproxyd
|
||||
|
||||
%post daemon-proxy
|
||||
%if %{with_modular_daemons}
|
||||
%libvirt_daemon_systemd_post_inet virtproxyd
|
||||
%endif
|
||||
|
||||
%preun daemon-proxy
|
||||
%libvirt_daemon_systemd_preun_inet virtproxyd
|
||||
|
||||
%posttrans daemon-proxy
|
||||
%libvirt_sysconfig_posttrans virtproxyd
|
||||
|
||||
%pre daemon-driver-network
|
||||
%libvirt_sysconfig_pre virtnetworkd
|
||||
|
||||
|
|
@ -1783,16 +1803,9 @@ exit 0
|
|||
%{_unitdir}/libvirtd-admin.socket
|
||||
%{_unitdir}/libvirtd-tcp.socket
|
||||
%{_unitdir}/libvirtd-tls.socket
|
||||
%{_unitdir}/virtproxyd.service
|
||||
%{_unitdir}/virtproxyd.socket
|
||||
%{_unitdir}/virtproxyd-ro.socket
|
||||
%{_unitdir}/virtproxyd-admin.socket
|
||||
%{_unitdir}/virtproxyd-tcp.socket
|
||||
%{_unitdir}/virtproxyd-tls.socket
|
||||
%{_unitdir}/virt-guest-shutdown.target
|
||||
%{_unitdir}/libvirt-guests.service
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
||||
%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
|
||||
|
|
@ -1812,8 +1825,6 @@ exit 0
|
|||
%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
|
||||
%{_datadir}/augeas/lenses/libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
|
||||
%{_datadir}/augeas/lenses/virtproxyd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
|
||||
%{_datadir}/polkit-1/actions/org.libvirt.api.policy
|
||||
%{_datadir}/polkit-1/rules.d/50-libvirt.rules
|
||||
|
|
@ -1821,14 +1832,12 @@ exit 0
|
|||
%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
|
||||
%attr(0755, root, root) %{_bindir}/virt-ssh-helper
|
||||
%attr(0755, root, root) %{_sbindir}/libvirtd
|
||||
%attr(0755, root, root) %{_sbindir}/virtproxyd
|
||||
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
|
||||
%{_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/virtproxyd.8*
|
||||
%{_bindir}/virt-host-validate
|
||||
%{_bindir}/virt-admin
|
||||
%{_datadir}/bash-completion/completions/virt-admin
|
||||
|
|
@ -1857,6 +1866,19 @@ exit 0
|
|||
%attr(0755, root, root) %{_sbindir}/virtlogd
|
||||
%{_mandir}/man8/virtlogd.8*
|
||||
|
||||
%files daemon-proxy
|
||||
%{_unitdir}/virtproxyd.service
|
||||
%{_unitdir}/virtproxyd.socket
|
||||
%{_unitdir}/virtproxyd-ro.socket
|
||||
%{_unitdir}/virtproxyd-admin.socket
|
||||
%{_unitdir}/virtproxyd-tcp.socket
|
||||
%{_unitdir}/virtproxyd-tls.socket
|
||||
%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
|
||||
%{_datadir}/augeas/lenses/virtproxyd.aug
|
||||
%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
|
||||
%attr(0755, root, root) %{_sbindir}/virtproxyd
|
||||
%{_mandir}/man8/virtproxyd.8*
|
||||
|
||||
%files daemon-config-network
|
||||
%dir %{_datadir}/libvirt/networks/
|
||||
%{_datadir}/libvirt/networks/default.xml
|
||||
|
|
|
|||
Loading…
Reference in New Issue