Move virt-login-shell into libvirt-login-shell sub-RPM

Many people will not want the setuid virt-login-shell binary
installed by default, so move it into a separate sub-RPM
named libvirt-login-shell. This RPM is only generated if
LXC is enabled

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-10-17 14:18:18 +01:00
parent 9cd6a57db6
commit 8adc92694f

View File

@ -1107,6 +1107,18 @@ Requires: cyrus-sasl-md5
Shared libraries and client binaries needed to access to the Shared libraries and client binaries needed to access to the
virtualization capabilities of recent versions of Linux (and other OSes). virtualization capabilities of recent versions of Linux (and other OSes).
%if %{with_lxc}
%package login-shell
Summary: Login shell for connecting users to an LXC container
Group: Development/Libraries
Requires: %{name}-client = %{version}-%{release}
%description login-shell
Provides the set-uid virt-login-shell binary that is used to
connect a user to an LXC container when they login, by switching
namespaces.
%endif
%package devel %package devel
Summary: Libraries, includes, etc. to compile with the libvirt library Summary: Libraries, includes, etc. to compile with the libvirt library
Group: Development/Libraries Group: Development/Libraries
@ -2015,23 +2027,14 @@ fi
%doc COPYING COPYING.LESSER %doc COPYING COPYING.LESSER
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
%if %{with_lxc}
%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
%endif
%{_mandir}/man1/virsh.1* %{_mandir}/man1/virsh.1*
%{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-xml-validate.1*
%{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-pki-validate.1*
%{_mandir}/man1/virt-host-validate.1* %{_mandir}/man1/virt-host-validate.1*
%if %{with_lxc}
%{_mandir}/man1/virt-login-shell.1*
%endif
%{_bindir}/virsh %{_bindir}/virsh
%{_bindir}/virt-xml-validate %{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate %{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate %{_bindir}/virt-host-validate
%if %{with_lxc}
%attr(4755, root, root) %{_bindir}/virt-login-shell
%endif
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%if %{with_dtrace} %if %{with_dtrace}
@ -2075,6 +2078,13 @@ fi
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%endif %endif
%if %{with_lxc}
%files login-shell
%attr(4755, root, root) %{_bindir}/virt-login-shell
%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
%{_mandir}/man1/virt-login-shell.1*
%endif
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)