From 30dafa429069c43ab32ca120bd7f529709e37509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 11 Nov 2015 23:46:42 -0500 Subject: [PATCH] Split out systemd-container subpackage --- systemd.spec | 81 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/systemd.spec b/systemd.spec index ecdfdff..706320d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -153,6 +153,22 @@ Obsoletes: libudev-devel < 183 Development headers and auxiliary files for developing applications linking to libudev or libsystemd. +%package container +# Name is the same as in Debian +Summary: Tools for containers and VMs +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +Obsoletes: %{name} < 227-8 +License: LGPLv2+ + +%description container +Systemd tools to spawn and manage containers and virtual machines. + +This package contains systemd-nspawn, machinectl, systemd-machined, +and systemd-importd. + %package journal-remote # Name is the same as in Debian Summary: Tools to send journal events over the network @@ -567,9 +583,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf @@ -603,12 +617,10 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_bindir}/systemd-machine-id-setup %{_bindir}/loginctl %{_bindir}/journalctl -%{_bindir}/machinectl %{_bindir}/busctl %{_bindir}/networkctl %{_bindir}/coredumpctl %{_bindir}/systemd-tmpfiles -%{_bindir}/systemd-nspawn %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-cat %{_bindir}/systemd-cgls @@ -630,9 +642,23 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{pkgdir}/systemd %{system_unit_dir} %{pkgdir}/user +%exclude %{system_unit_dir}/*.machine1.* +%exclude %{system_unit_dir}/*/*.machine1.* +%exclude %{system_unit_dir}/*.import1.* +%exclude %{system_unit_dir}/*/*.import1.* +%exclude %{system_unit_dir}/systemd-machined.service +%exclude %{system_unit_dir}/systemd-importd.service +%exclude %{system_unit_dir}/machine.slice +%exclude %{system_unit_dir}/machines.target +%exclude %{system_unit_dir}/var-lib-machines.mount +%exclude %{system_unit_dir}/*/var-lib-machines.mount %exclude %{system_unit_dir}/systemd-journal-gatewayd.* %exclude %{system_unit_dir}/systemd-journal-remote.* %exclude %{system_unit_dir}/systemd-journal-upload.* +%exclude %{pkgdir}/systemd-machined +%exclude %{pkgdir}/systemd-import +%exclude %{pkgdir}/systemd-importd +%exclude %{pkgdir}/systemd-pull %exclude %{pkgdir}/systemd-journal-gatewayd %exclude %{pkgdir}/systemd-journal-remote %exclude %{pkgdir}/systemd-journal-upload @@ -646,7 +672,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_prefix}/lib/tmpfiles.d/var.conf %{_prefix}/lib/tmpfiles.d/etc.conf %{_prefix}/lib/tmpfiles.d/home.conf -%{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf %{_prefix}/lib/tmpfiles.d/journal-nocow.conf %{_prefix}/lib/sysctl.d/50-default.conf %{_prefix}/lib/sysctl.d/50-coredump.conf @@ -656,7 +681,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{pkgdir}/catalog/systemd.catalog %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install -%{pkgdir}/import-pubring.gpg %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt @@ -668,6 +692,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man7/* +%exclude %{_mandir}/man1/machinectl.* +%exclude %{_mandir}/man8/systemd-machined.* +%exclude %{_mandir}/man8/*mymachines.* %exclude %{_mandir}/man8/systemd-journal-gatewayd.* %exclude %{_mandir}/man8/systemd-journal-remote.* %exclude %{_mandir}/man8/systemd-journal-upload.* @@ -683,9 +710,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -694,12 +719,12 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy %{_datadir}/pkgconfig/systemd.pc %{_datadir}/pkgconfig/udev.pc %{_datadir}/bash-completion/completions/* +%exclude %{_datadir}/bash-completion/completions/machinectl %{_datadir}/zsh/site-functions/* +%exclude %{_datadir}/zsh/site-functions/_machinectl %{pkgdir}/catalog/systemd.*.catalog %{pkgdir}/network/99-default.link %{pkgdir}/network/80-container-host0.network @@ -714,7 +739,6 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %files libs %{_libdir}/security/pam_systemd.so %{_libdir}/libnss_myhostname.so.2 -%{_libdir}/libnss_mymachines.so.2 %{_libdir}/libnss_resolve.so.2 %{_libdir}/libudev.so.* %{_libdir}/libsystemd.so.* @@ -752,6 +776,38 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_libdir}/pkgconfig/libsystemd-id128.pc %{_mandir}/man3/* +%files container +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_libdir}/libnss_mymachines.so.2 +%{_bindir}/machinectl +%{_bindir}/systemd-nspawn +%{pkgdir}/import-pubring.gpg +%{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf +%{system_unit_dir}/*.machine1.* +%{system_unit_dir}/*/*.machine1.* +%{system_unit_dir}/*.import1.* +%{system_unit_dir}/*/*.import1.* +%{system_unit_dir}/systemd-machined.service +%{system_unit_dir}/systemd-importd.service +%{system_unit_dir}/machine.slice +%{system_unit_dir}/machines.target +%{system_unit_dir}/var-lib-machines.mount +%{system_unit_dir}/*/var-lib-machines.mount +%{pkgdir}/systemd-journal-gatewayd +%{pkgdir}/systemd-journal-remote +%{pkgdir}/systemd-journal-upload +%{pkgdir}/systemd-machined +%{pkgdir}/systemd-import +%{pkgdir}/systemd-importd +%{pkgdir}/systemd-pull +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%{_datadir}/bash-completion/completions/machinectl +%{_datadir}/zsh/site-functions/_machinectl + %files journal-remote %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf %config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf @@ -771,6 +827,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd /usr/lib/firewalld/services/* %changelog +* Fri Nov 13 2015 Zbigniew Jędrzejewski-Szmek - 227-10 +- Split out systemd-container subpackage (#1163412) + * Thu Nov 12 2015 Zbigniew Jędrzejewski-Szmek - 227-7 - Rename journal-gateway subpackage to journal-remote - Ignore the access mode on /var/log/journal (#1048424)