diff --git a/systemd-mini.changes b/systemd-mini.changes index 3f238683..10d2ecc4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -67,6 +67,12 @@ Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel + +- split off networkd and resolved into separate network subpackage +- use separate lang package for translations + ------------------------------------------------------------------- Wed Sep 18 12:17:37 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 8c054fe6..6cb294d4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -331,6 +331,22 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with networkd} || %{with resolved} +%package network +Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +Provides: systemd:/usr/lib/systemd/systemd-networkd +Provides: systemd:/usr/lib/systemd/systemd-resolved +%systemd_requires + +%description network +Systemd tools to manage network settings using networkd and +resolver tools for resolved + +%endif + %if %{with portabled} %package portable Summary: Systemd tools for portable services @@ -398,7 +414,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -447,6 +463,8 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%lang_package + %prep %setup -q -n systemd-v%{version}%{suse_version} %autopatch -p1 @@ -769,13 +787,6 @@ systemctl daemon-reexec || : %systemd_post machines.target %systemd_post remote-fs.target %systemd_post systemd-timesyncd.service -%if %{with networkd} -%systemd_post systemd-networkd.service -%systemd_post systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%systemd_post systemd-resolved.service -%endif # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -818,12 +829,6 @@ test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service -%if %{with networkd} -%systemd_postun_with_restart systemd-networkd.service -%endif -%if %{with resolved} -%systemd_postun_with_restart systemd-resolved.service -%endif %pre -n udev%{?mini} # New installations uses the last compat symlink generation number @@ -936,6 +941,45 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with networkd} || %{with resolved} +%pre network +%if %{with networkd} +%service_add_pre systemd-networkd.service +%service_add_pre systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_pre systemd-resolved.service +%endif + +%post network +%tmpfiles_create portables.conf +%if %{with networkd} +%service_add_post systemd-networkd.service +%service_add_post systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_post systemd-resolved.service +%endif + +%preun network +%if %{with networkd} +%service_del_preun systemd-networkd.service +%service_del_preun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_preun systemd-resolved.service +%endif + +%postun network +%if %{with networkd} +%service_del_postun systemd-networkd.service +%service_del_postun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_postun systemd-resolved.service +%endif +%endif + %if %{with portabled} %pre portable %service_add_pre systemd-portabled.service @@ -953,7 +997,7 @@ fi %clean -%files -f systemd.lang +%files %defattr(-,root,root) %license LICENSE* /bin/systemd @@ -964,12 +1008,6 @@ fi %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl -%if %{with networkd} -%{_bindir}/networkctl -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -989,9 +1027,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt @@ -1064,9 +1099,6 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} -%{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/scripts %exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} @@ -1116,11 +1148,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%{_prefix}/lib/systemd/network/80-container-host0.network -%endif - %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1139,12 +1166,6 @@ fi %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%endif -%if %{with resolved} -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%endif %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d @@ -1156,12 +1177,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf -%if %{with networkd} -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%endif # FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d @@ -1190,12 +1205,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service -%if %{with networkd} -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1204,13 +1213,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with networkd} -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%endif -%if %{with resolved} -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1269,6 +1271,8 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%files lang -f systemd.lang + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1393,10 +1397,6 @@ fi %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%if %{with networkd} -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network -%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined @@ -1486,6 +1486,32 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%{_bindir}/networkctl +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_prefix}/lib/systemd/network/80-container-host0.network +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif +%if %{with resolved} +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_prefix}/lib/systemd/resolv.conf +%endif +%endif + %if %{with portabled} %files portable %defattr(-,root,root) diff --git a/systemd.changes b/systemd.changes index 3f238683..10d2ecc4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -67,6 +67,12 @@ Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel + +- split off networkd and resolved into separate network subpackage +- use separate lang package for translations + ------------------------------------------------------------------- Wed Sep 18 12:17:37 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 524d1cbc..77fd2cf7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -329,6 +329,22 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with networkd} || %{with resolved} +%package network +Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +Provides: systemd:/usr/lib/systemd/systemd-networkd +Provides: systemd:/usr/lib/systemd/systemd-resolved +%systemd_requires + +%description network +Systemd tools to manage network settings using networkd and +resolver tools for resolved + +%endif + %if %{with portabled} %package portable Summary: Systemd tools for portable services @@ -396,7 +412,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -445,6 +461,8 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%lang_package + %prep %setup -q -n systemd-v%{version}%{suse_version} %autopatch -p1 @@ -767,13 +785,6 @@ systemctl daemon-reexec || : %systemd_post machines.target %systemd_post remote-fs.target %systemd_post systemd-timesyncd.service -%if %{with networkd} -%systemd_post systemd-networkd.service -%systemd_post systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%systemd_post systemd-resolved.service -%endif # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -816,12 +827,6 @@ test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service -%if %{with networkd} -%systemd_postun_with_restart systemd-networkd.service -%endif -%if %{with resolved} -%systemd_postun_with_restart systemd-resolved.service -%endif %pre -n udev%{?mini} # New installations uses the last compat symlink generation number @@ -934,6 +939,45 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with networkd} || %{with resolved} +%pre network +%if %{with networkd} +%service_add_pre systemd-networkd.service +%service_add_pre systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_pre systemd-resolved.service +%endif + +%post network +%tmpfiles_create portables.conf +%if %{with networkd} +%service_add_post systemd-networkd.service +%service_add_post systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_post systemd-resolved.service +%endif + +%preun network +%if %{with networkd} +%service_del_preun systemd-networkd.service +%service_del_preun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_preun systemd-resolved.service +%endif + +%postun network +%if %{with networkd} +%service_del_postun systemd-networkd.service +%service_del_postun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_postun systemd-resolved.service +%endif +%endif + %if %{with portabled} %pre portable %service_add_pre systemd-portabled.service @@ -951,7 +995,7 @@ fi %clean -%files -f systemd.lang +%files %defattr(-,root,root) %license LICENSE* /bin/systemd @@ -962,12 +1006,6 @@ fi %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl -%if %{with networkd} -%{_bindir}/networkctl -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -987,9 +1025,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt @@ -1062,9 +1097,6 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} -%{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/scripts %exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} @@ -1114,11 +1146,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%{_prefix}/lib/systemd/network/80-container-host0.network -%endif - %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1137,12 +1164,6 @@ fi %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%endif -%if %{with resolved} -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%endif %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d @@ -1154,12 +1175,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf -%if %{with networkd} -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%endif # FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d @@ -1188,12 +1203,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service -%if %{with networkd} -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1202,13 +1211,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with networkd} -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%endif -%if %{with resolved} -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1267,6 +1269,8 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%files lang -f systemd.lang + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1391,10 +1395,6 @@ fi %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%if %{with networkd} -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network -%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined @@ -1484,6 +1484,32 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%{_bindir}/networkctl +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_prefix}/lib/systemd/network/80-container-host0.network +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif +%if %{with resolved} +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_prefix}/lib/systemd/resolv.conf +%endif +%endif + %if %{with portabled} %files portable %defattr(-,root,root)