From a340d8d64b7394099a8444b979662e22e1172267a23152ccf00ec48ed64ba275 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 Jan 2022 08:31:23 +0000 Subject: [PATCH 01/19] - Move the whole content of /usr/share/doc/packages/systemd in doc subpackage OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1229 --- systemd.changes | 5 +++++ systemd.spec | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/systemd.changes b/systemd.changes index 65d3231c..38b6dc6b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 19 15:34:05 UTC 2022 - Franck Bui + +- Move the whole content of /usr/share/doc/packages/systemd in doc subpackage + ------------------------------------------------------------------- Wed Jan 19 14:25:46 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1dbeb761..585db1a1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1542,9 +1542,6 @@ fi %endif %endif -%{_docdir}/systemd -%exclude %{_docdir}/systemd/html - %{_udevrulesdir}/70-uaccess.rules %{_udevrulesdir}/71-seat.rules %{_udevrulesdir}/73-seat-late.rules @@ -1572,8 +1569,7 @@ fi %if ! 0%{?bootstrap} %files doc %defattr(-,root,root,-) -%dir %{_docdir}/systemd -%{_docdir}/systemd/html +%{_docdir}/systemd %endif %files devel From 9213ceb53fbf8fa7253739c8f6f44b0299733077916a22d3a9e0f8222bf7fb1f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 21 Jan 2022 08:37:58 +0000 Subject: [PATCH 02/19] fix previous commit OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1230 --- systemd.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/systemd.spec b/systemd.spec index 585db1a1..a2c4706f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -221,7 +221,6 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. -%if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later @@ -230,9 +229,6 @@ Supplements: (systemd and patterns-base-documentation) %description doc The HTML documentation for systemd. -# /bootstrap -%endif - %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later @@ -1566,11 +1562,9 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc -%if ! 0%{?bootstrap} %files doc %defattr(-,root,root,-) -%{_docdir}/systemd -%endif +%{_docdir}/systemd/ %files devel %defattr(-,root,root,-) From eb8c3c4572cc145c88b1e402848047ae02139d9621917bbb7bea77790f06bf0e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 26 Jan 2022 14:18:47 +0000 Subject: [PATCH 03/19] - systemd.spec: explicitely list all files for each main (sub) packages OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1231 --- files.container | 54 ++++ files.network | 56 ++++ files.systemd | 846 ++++++++++++++++++++++++++++++++++++++++++++++++ files.udev | 126 ++++++++ systemd.changes | 22 ++ systemd.spec | 571 +++++--------------------------- 6 files changed, 1181 insertions(+), 494 deletions(-) create mode 100644 files.container create mode 100644 files.network create mode 100644 files.systemd create mode 100644 files.udev diff --git a/files.container b/files.container new file mode 100644 index 00000000..3f2baa79 --- /dev/null +++ b/files.container @@ -0,0 +1,54 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%dir %{_sysconfdir}/systemd/nspawn +%{_bindir}/systemd-nspawn +%if ! 0%{?bootstrap} +%{_datadir}/bash-completion/completions/systemd-nspawn +%{_datadir}/zsh/site-functions/_systemd-nspawn +%{_mandir}/man1/systemd-nspawn.1.gz +%{_mandir}/man5/systemd.nspawn.5.gz +%endif +%{_unitdir}/systemd-nspawn@.service + +%if %{with machined} +%dir %{_unitdir}/machines.target.wants +%{_bindir}/machinectl +%{_datadir}/bash-completion/completions/machinectl +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%{_datadir}/zsh/site-functions/_machinectl +%{_datadir}/zsh/site-functions/_sd_machines +%{_mandir}/man1/machinectl.1.gz +%{_mandir}/man5/org.freedesktop.machine1.5.gz +%{_mandir}/man8/systemd-machined.8.gz +%{_mandir}/man8/systemd-machined.service.8.gz +%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +%{_systemd_util_dir}/system/machines.target +%{_systemd_util_dir}/systemd-machined +%{_tmpfilesdir}/systemd-nspawn.conf +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/machine.slice +%{_unitdir}/machines.target.wants/var-lib-machines.mount +%{_unitdir}/remote-fs.target.wants/var-lib-machines.mount +%{_unitdir}/systemd-machined.service +%{_unitdir}/var-lib-machines.mount +%endif + +%if %{with importd} +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%{_mandir}/man5/org.freedesktop.import1.5.gz +%{_mandir}/man8/systemd-importd.8.gz +%{_mandir}/man8/systemd-importd.service.8.gz +%{_systemd_util_dir}/import-pubring.gpg +%{_systemd_util_dir}/systemd-export +%{_systemd_util_dir}/systemd-import +%{_systemd_util_dir}/systemd-import-fs +%{_systemd_util_dir}/systemd-importd +%{_systemd_util_dir}/systemd-pull +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_unitdir}/systemd-importd.service +%endif diff --git a/files.network b/files.network new file mode 100644 index 00000000..fa5a0bde --- /dev/null +++ b/files.network @@ -0,0 +1,56 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%dir %{_sysconfdir}/systemd/network +%dir %{_systemd_util_dir}/network +%{_bindir}/networkctl +%{_datadir}/bash-completion/completions/networkctl +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_datadir}/zsh/site-functions/_networkctl +%{_mandir}/man1/networkctl.1.gz +%{_mandir}/man5/networkd.conf.5.gz +%{_mandir}/man5/networkd.conf.d.5.gz +%{_mandir}/man5/systemd.network.5.gz +%{_mandir}/man8/systemd-networkd-wait-online.8.gz +%{_mandir}/man8/systemd-networkd-wait-online.service.8.gz +%{_mandir}/man8/systemd-networkd.8.gz +%{_mandir}/man8/systemd-networkd.service.8.gz +%{_systemd_util_dir}/network/80-container-host0.network +%{_systemd_util_dir}/network/80-container-ve.network +%{_systemd_util_dir}/network/80-container-vz.network +%{_systemd_util_dir}/network/80-vm-vt.network +%{_systemd_util_dir}/network/80-wifi-adhoc.network +%{_systemd_util_dir}/network/80-wifi-ap.network.example +%{_systemd_util_dir}/network/80-wifi-station.network.example +%{_systemd_util_dir}/systemd-networkd +%{_systemd_util_dir}/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd-wait-online.service +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%endif + +%if %{with resolved} +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%{_datadir}/bash-completion/completions/resolvectl +%{_datadir}/bash-completion/completions/systemd-resolve +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_datadir}/zsh/site-functions/_resolvectl +%{_mandir}/man1/resolvectl.1.gz +%{_mandir}/man5/org.freedesktop.resolve1.5.gz +%{_mandir}/man5/resolved.conf.5.gz +%{_mandir}/man5/resolved.conf.d.5.gz +%{_mandir}/man8/systemd-resolved.8.gz +%{_mandir}/man8/systemd-resolved.service.8.gz +%{_systemd_util_dir}/resolv.conf +%{_systemd_util_dir}/systemd-resolved +%{_unitdir}/systemd-resolved.service +%endif diff --git a/files.systemd b/files.systemd new file mode 100644 index 00000000..392d5f79 --- /dev/null +++ b/files.systemd @@ -0,0 +1,846 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf +%config(noreplace) %{_sysconfdir}/systemd/user.conf +%dir %{_binfmtdir} +%if ! 0%{?bootstrap} +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%endif +%dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/services +%dir %{_datadir}/dbus-1/system-services +%dir %{_datadir}/dbus-1/system.d +%dir %{_datadir}/factory +%dir %{_datadir}/polkit-1 +%dir %{_datadir}/polkit-1/actions +%dir %{_datadir}/systemd +%if ! 0%{?bootstrap} +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%endif +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%dir %{_environmentdir} +%dir %{_journalcatalogdir} +%dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} +%dir %{_localstatedir}/lib/systemd/migrated +%dir %{_localstatedir}/lib/systemd/sysv-convert +%endif +%dir %{_modprobedir} +%dir %{_modulesloaddir} +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%dir %{_sysconfdir}/X11/xorg.conf.d +%dir %{_sysconfdir}/binfmt.d +%dir %{_sysconfdir}/modules-load.d +%dir %{_sysconfdir}/sysctl.d +%dir %{_sysconfdir}/systemd +%dir %{_sysconfdir}/systemd/system +%dir %{_sysconfdir}/systemd/user +%dir %{_sysconfdir}/tmpfiles.d +%dir %{_sysconfdir}/xdg/systemd +%dir %{_sysctldir} +%dir %{_systemd_system_env_generator_dir} +%dir %{_systemd_user_env_generator_dir} +%dir %{_systemd_util_dir} +%if %{with sd_boot} +%dir %{_systemd_util_dir}/boot +%dir %{_systemd_util_dir}/boot/efi +%endif +%dir %{_systemd_util_dir}/ntp-units.d +%dir %{_systemd_util_dir}/scripts +%dir %{_systemd_util_dir}/system +%dir %{_systemd_util_dir}/system-preset +%dir %{_systemd_util_dir}/system-shutdown +%dir %{_systemd_util_dir}/system-sleep +%dir %{_systemd_util_dir}/system/basic.target.wants +%dir %{_systemd_util_dir}/system/dbus.target.wants +%dir %{_systemd_util_dir}/system/default.target.wants +%dir %{_systemd_util_dir}/system/graphical.target.wants +%dir %{_systemd_util_dir}/system/halt.target.wants +%dir %{_systemd_util_dir}/system/initrd-root-device.target.wants +%dir %{_systemd_util_dir}/system/initrd-root-fs.target.wants +%dir %{_systemd_util_dir}/system/kexec.target.wants +%dir %{_systemd_util_dir}/system/local-fs.target.wants +%dir %{_systemd_util_dir}/system/multi-user.target.wants +%dir %{_systemd_util_dir}/system/poweroff.target.wants +%dir %{_systemd_util_dir}/system/reboot.target.wants +%dir %{_systemd_util_dir}/system/remote-fs.target.wants +%dir %{_systemd_util_dir}/system/rescue.target.wants +%if %{with sysvcompat} +%dir %{_systemd_util_dir}/system/runlevel1.target.wants +%dir %{_systemd_util_dir}/system/runlevel2.target.wants +%dir %{_systemd_util_dir}/system/runlevel3.target.wants +%dir %{_systemd_util_dir}/system/runlevel4.target.wants +%dir %{_systemd_util_dir}/system/runlevel5.target.wants +%endif +%dir %{_systemd_util_dir}/system/shutdown.target.wants +%dir %{_systemd_util_dir}/system/sockets.target.wants +%dir %{_systemd_util_dir}/system/sysinit.target.wants +%dir %{_systemd_util_dir}/system/timers.target.wants +%dir %{_systemd_util_dir}/user +%dir %{_systemd_util_dir}/user-generators +%dir %{_systemd_util_dir}/user-preset +%dir %{_systemdgeneratordir} +%dir %{_systemdusergeneratordir} +%dir %{_sysusersdir} +%dir %{_tmpfilesdir} +%doc %{_modprobedir}/README +%doc %{_sysctldir}/README +%doc %{_sysusersdir}/README +%doc %{_tmpfilesdir}/README +%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id +%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed +%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf +%ghost %config(noreplace) %{_sysconfdir}/locale.conf +%ghost %config(noreplace) %{_sysconfdir}/machine-info +%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal +%ghost %{_localstatedir}/lib/systemd/backlight +%ghost %{_localstatedir}/lib/systemd/catalog/database +%ghost %{_localstatedir}/lib/systemd/i18n-migrated +%license LICENSE.GPL2 +%license LICENSE.LGPL2.1 +%if %{with sd_boot} +%{_bindir}/bootctl +%endif +%{_bindir}/busctl +%{_bindir}/hostnamectl +%{_bindir}/journalctl +%{_bindir}/kernel-install +%{_bindir}/localectl +%{_bindir}/loginctl +%{_bindir}/systemctl +%{_bindir}/systemd-analyze +%{_bindir}/systemd-ask-password +%{_bindir}/systemd-cat +%{_bindir}/systemd-cgls +%{_bindir}/systemd-cgtop +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif +%{_bindir}/systemd-delta +%{_bindir}/systemd-detect-virt +%{_bindir}/systemd-dissect +%{_bindir}/systemd-escape +%{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 +%{_bindir}/systemd-inhibit +%{_bindir}/systemd-machine-id-setup +%{_bindir}/systemd-mount +%{_bindir}/systemd-notify +%{_bindir}/systemd-path +%{_bindir}/systemd-run +%{_bindir}/systemd-socket-activate +%{_bindir}/systemd-stdio-bridge +%{_bindir}/systemd-sysext +%{_bindir}/systemd-sysusers +%{_bindir}/systemd-tmpfiles +%{_bindir}/systemd-tty-ask-password-agent +%{_bindir}/systemd-umount +%{_bindir}/timedatectl +%if ! 0%{?bootstrap} +%if %{with sd_boot} +%{_datadir}/bash-completion/completions/bootctl +%endif +%{_datadir}/bash-completion/completions/busctl +%{_datadir}/bash-completion/completions/coredumpctl +%{_datadir}/bash-completion/completions/hostnamectl +%{_datadir}/bash-completion/completions/journalctl +%{_datadir}/bash-completion/completions/kernel-install +%{_datadir}/bash-completion/completions/localectl +%{_datadir}/bash-completion/completions/loginctl +%{_datadir}/bash-completion/completions/portablectl +%{_datadir}/bash-completion/completions/systemctl +%{_datadir}/bash-completion/completions/systemd-analyze +%{_datadir}/bash-completion/completions/systemd-cat +%{_datadir}/bash-completion/completions/systemd-cgls +%{_datadir}/bash-completion/completions/systemd-cgtop +%{_datadir}/bash-completion/completions/systemd-delta +%{_datadir}/bash-completion/completions/systemd-detect-virt +%{_datadir}/bash-completion/completions/systemd-id128 +%{_datadir}/bash-completion/completions/systemd-path +%{_datadir}/bash-completion/completions/systemd-run +%{_datadir}/bash-completion/completions/timedatectl +%endif +%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf +%{_datadir}/pkgconfig/systemd.pc +%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy +%{_datadir}/systemd/kbd-model-map +%{_datadir}/systemd/language-fallback-map +%if ! 0%{?bootstrap} +%if %{with sd_boot} +%{_datadir}/zsh/site-functions/_bootctl +%endif +%{_datadir}/zsh/site-functions/_busctl +%{_datadir}/zsh/site-functions/_coredumpctl +%{_datadir}/zsh/site-functions/_hostnamectl +%{_datadir}/zsh/site-functions/_journalctl +%{_datadir}/zsh/site-functions/_kernel-install +%{_datadir}/zsh/site-functions/_localectl +%{_datadir}/zsh/site-functions/_loginctl +%{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host +%{_datadir}/zsh/site-functions/_sd_outputmodes +%{_datadir}/zsh/site-functions/_sd_unit_files +%{_datadir}/zsh/site-functions/_systemctl +%{_datadir}/zsh/site-functions/_systemd +%{_datadir}/zsh/site-functions/_systemd-analyze +%{_datadir}/zsh/site-functions/_systemd-delta +%{_datadir}/zsh/site-functions/_systemd-inhibit +%{_datadir}/zsh/site-functions/_systemd-path +%{_datadir}/zsh/site-functions/_systemd-run +%{_datadir}/zsh/site-functions/_systemd-tmpfiles +%{_datadir}/zsh/site-functions/_timedatectl +%endif +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +%{_environmentdir}/99-environment.conf +%{_journalcatalogdir}/systemd.be.catalog +%{_journalcatalogdir}/systemd.be@latin.catalog +%{_journalcatalogdir}/systemd.bg.catalog +%{_journalcatalogdir}/systemd.catalog +%{_journalcatalogdir}/systemd.de.catalog +%{_journalcatalogdir}/systemd.fr.catalog +%{_journalcatalogdir}/systemd.it.catalog +%{_journalcatalogdir}/systemd.pl.catalog +%{_journalcatalogdir}/systemd.pt_BR.catalog +%{_journalcatalogdir}/systemd.ru.catalog +%{_journalcatalogdir}/systemd.zh_CN.catalog +%{_journalcatalogdir}/systemd.zh_TW.catalog +%if ! 0%{bootstrap} +%if %{with sd_boot} +%{_mandir}/man1/bootctl.1.gz +%endif +%{_mandir}/man1/busctl.1.gz +%{_mandir}/man1/hostnamectl.1.gz +%{_mandir}/man1/journalctl.1.gz +%{_mandir}/man1/localectl.1.gz +%{_mandir}/man1/loginctl.1.gz +%{_mandir}/man1/systemctl.1.gz +%{_mandir}/man1/systemd-analyze.1.gz +%{_mandir}/man1/systemd-ask-password.1.gz +%{_mandir}/man1/systemd-cat.1.gz +%{_mandir}/man1/systemd-cgls.1.gz +%{_mandir}/man1/systemd-cgtop.1.gz +%{_mandir}/man1/systemd-cryptenroll.1.gz +%{_mandir}/man1/systemd-delta.1.gz +%{_mandir}/man1/systemd-detect-virt.1.gz +%{_mandir}/man1/systemd-dissect.1.gz +%{_mandir}/man1/systemd-escape.1.gz +%{_mandir}/man1/systemd-firstboot.1.gz +%{_mandir}/man1/systemd-firstboot.service.1.gz +%{_mandir}/man1/systemd-id128.1.gz +%{_mandir}/man1/systemd-inhibit.1.gz +%{_mandir}/man1/systemd-machine-id-setup.1.gz +%{_mandir}/man1/systemd-mount.1.gz +%{_mandir}/man1/systemd-notify.1.gz +%{_mandir}/man1/systemd-path.1.gz +%{_mandir}/man1/systemd-run.1.gz +%{_mandir}/man1/systemd-socket-activate.1.gz +%{_mandir}/man1/systemd-tty-ask-password-agent.1.gz +%{_mandir}/man1/systemd-umount.1.gz +%{_mandir}/man1/systemd.1.gz +%{_mandir}/man1/timedatectl.1.gz +%{_mandir}/man5/binfmt.d.5.gz +%{_mandir}/man5/crypttab.5.gz +%{_mandir}/man5/dnssec-trust-anchors.d.5.gz +%{_mandir}/man5/environment.d.5.gz +%{_mandir}/man5/hostname.5.gz +%{_mandir}/man5/initrd-release.5.gz +%{_mandir}/man5/journald.conf.5.gz +%{_mandir}/man5/journald.conf.d.5.gz +%{_mandir}/man5/journald@.conf.5.gz +%if %{with sd_boot} +%{_mandir}/man5/loader.conf.5.gz +%endif +%{_mandir}/man5/locale.conf.5.gz +%{_mandir}/man5/localtime.5.gz +%{_mandir}/man5/logind.conf.5.gz +%{_mandir}/man5/logind.conf.d.5.gz +%{_mandir}/man5/machine-id.5.gz +%{_mandir}/man5/machine-info.5.gz +%{_mandir}/man5/modules-load.d.5.gz +%{_mandir}/man5/org.freedesktop.LogControl1.5.gz +%{_mandir}/man5/org.freedesktop.hostname1.5.gz +%{_mandir}/man5/org.freedesktop.locale1.5.gz +%{_mandir}/man5/org.freedesktop.login1.5.gz +%{_mandir}/man5/org.freedesktop.portable1.5.gz +%{_mandir}/man5/org.freedesktop.systemd1.5.gz +%{_mandir}/man5/org.freedesktop.timedate1.5.gz +%{_mandir}/man5/os-release.5.gz +%{_mandir}/man5/sleep.conf.d.5.gz +%{_mandir}/man5/sysctl.d.5.gz +%{_mandir}/man5/system.conf.d.5.gz +%{_mandir}/man5/systemd-sleep.conf.5.gz +%{_mandir}/man5/systemd-system.conf.5.gz +%{_mandir}/man5/systemd-user-runtime-dir.5.gz +%{_mandir}/man5/systemd-user.conf.5.gz +%{_mandir}/man5/systemd.automount.5.gz +%{_mandir}/man5/systemd.device.5.gz +%{_mandir}/man5/systemd.dnssd.5.gz +%{_mandir}/man5/systemd.exec.5.gz +%{_mandir}/man5/systemd.kill.5.gz +%{_mandir}/man5/systemd.link.5.gz +%{_mandir}/man5/systemd.mount.5.gz +%{_mandir}/man5/systemd.negative.5.gz +%{_mandir}/man5/systemd.netdev.5.gz +%{_mandir}/man5/systemd.path.5.gz +%{_mandir}/man5/systemd.positive.5.gz +%{_mandir}/man5/systemd.preset.5.gz +%{_mandir}/man5/systemd.resource-control.5.gz +%{_mandir}/man5/systemd.scope.5.gz +%{_mandir}/man5/systemd.service.5.gz +%{_mandir}/man5/systemd.slice.5.gz +%{_mandir}/man5/systemd.socket.5.gz +%{_mandir}/man5/systemd.swap.5.gz +%{_mandir}/man5/systemd.target.5.gz +%{_mandir}/man5/systemd.timer.5.gz +%{_mandir}/man5/systemd.unit.5.gz +%{_mandir}/man5/sysusers.d.5.gz +%{_mandir}/man5/timesyncd.conf.5.gz +%{_mandir}/man5/timesyncd.conf.d.5.gz +%{_mandir}/man5/tmpfiles.d.5.gz +%{_mandir}/man5/user-runtime-dir@.service.5.gz +%{_mandir}/man5/user.conf.d.5.gz +%{_mandir}/man5/user@.service.5.gz +%{_mandir}/man5/vconsole.conf.5.gz +%{_mandir}/man5/veritytab.5.gz +%{_mandir}/man7/bootup.7.gz +%{_mandir}/man7/daemon.7.gz +%{_mandir}/man7/file-hierarchy.7.gz +%{_mandir}/man7/kernel-command-line.7.gz +%if %{with sd_boot} +%{_mandir}/man7/sd-boot.7.gz +%{_mandir}/man7/systemd-boot.7.gz +%endif +%{_mandir}/man7/systemd.directives.7.gz +%{_mandir}/man7/systemd.environment-generator.7.gz +%{_mandir}/man7/systemd.generator.7.gz +%{_mandir}/man7/systemd.index.7.gz +%{_mandir}/man7/systemd.journal-fields.7.gz +%{_mandir}/man7/systemd.net-naming-scheme.7.gz +%{_mandir}/man7/systemd.offline-updates.7.gz +%{_mandir}/man7/systemd.special.7.gz +%{_mandir}/man7/systemd.syntax.7.gz +%{_mandir}/man7/systemd.time.7.gz +%{_mandir}/man8/30-systemd-environment-d-generator.8.gz +%{_mandir}/man8/kernel-install.8.gz +%{_mandir}/man8/pam_systemd.8.gz +%{_mandir}/man8/rc-local.service.8.gz +%{_mandir}/man8/systemd-ask-password-console.path.8.gz +%{_mandir}/man8/systemd-ask-password-console.service.8.gz +%{_mandir}/man8/systemd-ask-password-wall.path.8.gz +%{_mandir}/man8/systemd-ask-password-wall.service.8.gz +%{_mandir}/man8/systemd-backlight.8.gz +%{_mandir}/man8/systemd-backlight@.service.8.gz +%{_mandir}/man8/systemd-binfmt.8.gz +%{_mandir}/man8/systemd-binfmt.service.8.gz +%if %{with sd_boot} +%{_mandir}/man8/systemd-bless-boot-generator.8.gz +%{_mandir}/man8/systemd-bless-boot.8.gz +%{_mandir}/man8/systemd-bless-boot.service.8.gz +%endif +%{_mandir}/man8/systemd-boot-check-no-failures.8.gz +%{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz +%if %{with sd_boot} +%{_mandir}/man8/systemd-boot-system-token.service.8.gz +%endif +%{_mandir}/man8/systemd-cryptsetup-generator.8.gz +%{_mandir}/man8/systemd-cryptsetup.8.gz +%{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-debug-generator.8.gz +%{_mandir}/man8/systemd-environment-d-generator.8.gz +%{_mandir}/man8/systemd-fsck-root.service.8.gz +%{_mandir}/man8/systemd-fsck.8.gz +%{_mandir}/man8/systemd-fsck@.service.8.gz +%{_mandir}/man8/systemd-fstab-generator.8.gz +%{_mandir}/man8/systemd-getty-generator.8.gz +%{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs.8.gz +%{_mandir}/man8/systemd-growfs@.service.8.gz +%{_mandir}/man8/systemd-halt.service.8.gz +%{_mandir}/man8/systemd-hibernate-resume-generator.8.gz +%{_mandir}/man8/systemd-hibernate-resume.8.gz +%{_mandir}/man8/systemd-hibernate-resume@.service.8.gz +%{_mandir}/man8/systemd-hibernate.service.8.gz +%{_mandir}/man8/systemd-hostnamed.8.gz +%{_mandir}/man8/systemd-hostnamed.service.8.gz +%{_mandir}/man8/systemd-hybrid-sleep.service.8.gz +%{_mandir}/man8/systemd-initctl.8.gz +%{_mandir}/man8/systemd-initctl.service.8.gz +%{_mandir}/man8/systemd-initctl.socket.8.gz +%{_mandir}/man8/systemd-journald-audit.socket.8.gz +%{_mandir}/man8/systemd-journald-dev-log.socket.8.gz +%{_mandir}/man8/systemd-journald-varlink@.socket.8.gz +%{_mandir}/man8/systemd-journald.8.gz +%{_mandir}/man8/systemd-journald.service.8.gz +%{_mandir}/man8/systemd-journald.socket.8.gz +%{_mandir}/man8/systemd-journald@.service.8.gz +%{_mandir}/man8/systemd-journald@.socket.8.gz +%{_mandir}/man8/systemd-kexec.service.8.gz +%{_mandir}/man8/systemd-localed.8.gz +%{_mandir}/man8/systemd-localed.service.8.gz +%{_mandir}/man8/systemd-logind.8.gz +%{_mandir}/man8/systemd-logind.service.8.gz +%{_mandir}/man8/systemd-machine-id-commit.service.8.gz +%{_mandir}/man8/systemd-makefs.8.gz +%{_mandir}/man8/systemd-makefs@.service.8.gz +%{_mandir}/man8/systemd-mkswap@.service.8.gz +%{_mandir}/man8/systemd-modules-load.8.gz +%{_mandir}/man8/systemd-modules-load.service.8.gz +%{_mandir}/man8/systemd-poweroff.service.8.gz +%{_mandir}/man8/systemd-quotacheck.8.gz +%{_mandir}/man8/systemd-quotacheck.service.8.gz +%{_mandir}/man8/systemd-random-seed.8.gz +%{_mandir}/man8/systemd-random-seed.service.8.gz +%{_mandir}/man8/systemd-rc-local-generator.8.gz +%{_mandir}/man8/systemd-reboot.service.8.gz +%{_mandir}/man8/systemd-remount-fs.8.gz +%{_mandir}/man8/systemd-remount-fs.service.8.gz +%{_mandir}/man8/systemd-rfkill.8.gz +%{_mandir}/man8/systemd-rfkill.service.8.gz +%{_mandir}/man8/systemd-rfkill.socket.8.gz +%{_mandir}/man8/systemd-run-generator.8.gz +%{_mandir}/man8/systemd-shutdown.8.gz +%{_mandir}/man8/systemd-sleep.8.gz +%{_mandir}/man8/systemd-socket-proxyd.8.gz +%{_mandir}/man8/systemd-suspend-then-hibernate.service.8.gz +%{_mandir}/man8/systemd-suspend.service.8.gz +%{_mandir}/man8/systemd-sysctl.8.gz +%{_mandir}/man8/systemd-sysctl.service.8.gz +%{_mandir}/man8/systemd-sysext.8.gz +%{_mandir}/man8/systemd-sysext.service.8.gz +%{_mandir}/man8/systemd-system-update-generator.8.gz +%{_mandir}/man8/systemd-sysusers.8.gz +%{_mandir}/man8/systemd-sysusers.service.8.gz +%{_mandir}/man8/systemd-sysv-generator.8.gz +%{_mandir}/man8/systemd-time-wait-sync.8.gz +%{_mandir}/man8/systemd-time-wait-sync.service.8.gz +%{_mandir}/man8/systemd-timedated.8.gz +%{_mandir}/man8/systemd-timedated.service.8.gz +%{_mandir}/man8/systemd-timesyncd.8.gz +%{_mandir}/man8/systemd-timesyncd.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-clean.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-clean.timer.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup.service.8.gz +%{_mandir}/man8/systemd-tmpfiles.8.gz +%{_mandir}/man8/systemd-update-done.8.gz +%{_mandir}/man8/systemd-update-done.service.8.gz +%{_mandir}/man8/systemd-update-utmp-runlevel.service.8.gz +%{_mandir}/man8/systemd-update-utmp.8.gz +%{_mandir}/man8/systemd-update-utmp.service.8.gz +%{_mandir}/man8/systemd-user-sessions.8.gz +%{_mandir}/man8/systemd-user-sessions.service.8.gz +%{_mandir}/man8/systemd-vconsole-setup.8.gz +%{_mandir}/man8/systemd-vconsole-setup.service.8.gz +%{_mandir}/man8/systemd-veritysetup-generator.8.gz +%{_mandir}/man8/systemd-veritysetup.8.gz +%{_mandir}/man8/systemd-veritysetup@.service.8.gz +%{_mandir}/man8/systemd-volatile-root.8.gz +%{_mandir}/man8/systemd-volatile-root.service.8.gz +%{_mandir}/man8/systemd-xdg-autostart-generator.8.gz +%endif +%{_modprobedir}/systemd.conf +%{_pam_moduledir}/pam_systemd.so +%{_pam_vendordir}/systemd-user +%{_prefix}/lib/kernel/install.d/00-entry-directory.install +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install +%{_sysconfdir}/xdg/systemd/user +%{_sysctldir}/99-sysctl.conf +%{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator +%if %{with sd_boot} +# These are part of the very few exceptions where glob pattern is allowd. +%{_systemd_util_dir}/boot/efi/linux*.efi.stub +%{_systemd_util_dir}/boot/efi/linux*.elf.stub +%{_systemd_util_dir}/boot/efi/systemd-boot*.efi +%endif +%{_systemd_util_dir}/libsystemd-shared-249.so +%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list +%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh +%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh +%{_systemd_util_dir}/system-preset/99-default.preset +%{_systemd_util_dir}/system/after-local.service +%{_systemd_util_dir}/system/autovt@.service +%{_systemd_util_dir}/system/basic.target +%{_systemd_util_dir}/system/blockdev@.target +%{_systemd_util_dir}/system/bluetooth.target +%{_systemd_util_dir}/system/boot-complete.target +%{_systemd_util_dir}/system/console-getty.service +%{_systemd_util_dir}/system/container-getty@.service +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/cryptsetup-pre.target +%{_systemd_util_dir}/system/cryptsetup.target +%endif +%{_systemd_util_dir}/system/ctrl-alt-del.target +%{_systemd_util_dir}/system/dbus-org.freedesktop.hostname1.service +%{_systemd_util_dir}/system/dbus-org.freedesktop.locale1.service +%{_systemd_util_dir}/system/dbus-org.freedesktop.login1.service +%{_systemd_util_dir}/system/dbus-org.freedesktop.timedate1.service +%{_systemd_util_dir}/system/debug-shell.service +%{_systemd_util_dir}/system/default.target +%{_systemd_util_dir}/system/dev-hugepages.mount +%{_systemd_util_dir}/system/dev-mqueue.mount +%{_systemd_util_dir}/system/emergency.service +%{_systemd_util_dir}/system/emergency.target +%{_systemd_util_dir}/system/exit.target +%{_systemd_util_dir}/system/final.target +%{_systemd_util_dir}/system/first-boot-complete.target +%{_systemd_util_dir}/system/getty-pre.target +%{_systemd_util_dir}/system/getty.target +%{_systemd_util_dir}/system/getty@.service +%{_systemd_util_dir}/system/graphical.target +%if %{with sysvcompat} +%{_systemd_util_dir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_systemd_util_dir}/system/halt.target +%{_systemd_util_dir}/system/hibernate.target +%{_systemd_util_dir}/system/hybrid-sleep.target +%{_systemd_util_dir}/system/initrd-cleanup.service +%{_systemd_util_dir}/system/initrd-fs.target +%{_systemd_util_dir}/system/initrd-parse-etc.service +%{_systemd_util_dir}/system/initrd-root-device.target +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/initrd-root-device.target.wants/remote-cryptsetup.target +%{_systemd_util_dir}/system/initrd-root-device.target.wants/remote-veritysetup.target +%endif +%{_systemd_util_dir}/system/initrd-root-fs.target +%{_systemd_util_dir}/system/initrd-switch-root.service +%{_systemd_util_dir}/system/initrd-switch-root.target +%{_systemd_util_dir}/system/initrd-usr-fs.target +%{_systemd_util_dir}/system/initrd.target +%{_systemd_util_dir}/system/kexec.target +%{_systemd_util_dir}/system/local-fs-pre.target +%{_systemd_util_dir}/system/local-fs.target +%{_systemd_util_dir}/system/local-fs.target.wants/tmp.mount +%if %{with sysvcompat} +%{_systemd_util_dir}/system/local-fs.target.wants/var-lock.mount +%{_systemd_util_dir}/system/local-fs.target.wants/var-run.mount +%endif +%{_systemd_util_dir}/system/modprobe@.service +%{_systemd_util_dir}/system/multi-user.target +%{_systemd_util_dir}/system/multi-user.target.wants/after-local.service +%{_systemd_util_dir}/system/multi-user.target.wants/getty.target +%{_systemd_util_dir}/system/multi-user.target.wants/systemd-logind.service +%if %{with sysvcompat} +%{_systemd_util_dir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_systemd_util_dir}/system/multi-user.target.wants/systemd-user-sessions.service +%{_systemd_util_dir}/system/network-online.target +%{_systemd_util_dir}/system/network-pre.target +%{_systemd_util_dir}/system/network.target +%{_systemd_util_dir}/system/nss-lookup.target +%{_systemd_util_dir}/system/nss-user-lookup.target +%{_systemd_util_dir}/system/paths.target +%{_systemd_util_dir}/system/poweroff.target +%{_systemd_util_dir}/system/printer.target +%{_systemd_util_dir}/system/proc-sys-fs-binfmt_misc.automount +%{_systemd_util_dir}/system/proc-sys-fs-binfmt_misc.mount +%{_systemd_util_dir}/system/quotaon.service +%if %{with sysvcompat} +%{_systemd_util_dir}/system/rc-local.service +%endif +%{_systemd_util_dir}/system/reboot.target +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/remote-cryptsetup.target +%endif +%{_systemd_util_dir}/system/remote-fs-pre.target +%{_systemd_util_dir}/system/remote-fs.target +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/remote-veritysetup.target +%endif +%{_systemd_util_dir}/system/rescue.service +%{_systemd_util_dir}/system/rescue.target +%if %{with sysvcompat} +%{_systemd_util_dir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_systemd_util_dir}/system/rpcbind.target +%if %{with sysvcompat} +%{_systemd_util_dir}/system/runlevel0.target +%{_systemd_util_dir}/system/runlevel1.target +%{_systemd_util_dir}/system/runlevel2.target +%{_systemd_util_dir}/system/runlevel3.target +%{_systemd_util_dir}/system/runlevel4.target +%{_systemd_util_dir}/system/runlevel5.target +%{_systemd_util_dir}/system/runlevel6.target +%endif +%{_systemd_util_dir}/system/serial-getty@.service +%{_systemd_util_dir}/system/shutdown.target +%{_systemd_util_dir}/system/sigpwr.target +%{_systemd_util_dir}/system/sleep.target +%{_systemd_util_dir}/system/slices.target +%{_systemd_util_dir}/system/smartcard.target +%{_systemd_util_dir}/system/sockets.target +%if %{with sysvcompat} +%{_systemd_util_dir}/system/sockets.target.wants/systemd-initctl.socket +%endif +%{_systemd_util_dir}/system/sockets.target.wants/systemd-journald-dev-log.socket +%{_systemd_util_dir}/system/sockets.target.wants/systemd-journald.socket +%{_systemd_util_dir}/system/sound.target +%{_systemd_util_dir}/system/suspend-then-hibernate.target +%{_systemd_util_dir}/system/suspend.target +%{_systemd_util_dir}/system/swap.target +%{_systemd_util_dir}/system/sys-fs-fuse-connections.mount +%{_systemd_util_dir}/system/sys-kernel-config.mount +%{_systemd_util_dir}/system/sys-kernel-debug.mount +%{_systemd_util_dir}/system/sys-kernel-tracing.mount +%{_systemd_util_dir}/system/sysinit.target +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/sysinit.target.wants/cryptsetup.target +%endif +%{_systemd_util_dir}/system/sysinit.target.wants/dev-hugepages.mount +%{_systemd_util_dir}/system/sysinit.target.wants/dev-mqueue.mount +%{_systemd_util_dir}/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount +%{_systemd_util_dir}/system/sysinit.target.wants/sys-fs-fuse-connections.mount +%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-config.mount +%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-debug.mount +%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-tracing.mount +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-ask-password-console.path +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-binfmt.service +%if %{with sd_boot} +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-boot-system-token.service +%endif +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-firstboot.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journal-catalog-update.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journal-flush.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journald.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-machine-id-commit.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-modules-load.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-random-seed.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-sysctl.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-sysusers.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-tmpfiles-setup.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-update-done.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-update-utmp.service +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/sysinit.target.wants/veritysetup.target +%endif +%{_systemd_util_dir}/system/syslog.socket +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/system-systemd\x2dcryptsetup.slice +%endif +%{_systemd_util_dir}/system/system-update-cleanup.service +%{_systemd_util_dir}/system/system-update-pre.target +%{_systemd_util_dir}/system/system-update.target +%{_systemd_util_dir}/system/systemd-ask-password-console.path +%{_systemd_util_dir}/system/systemd-ask-password-console.service +%{_systemd_util_dir}/system/systemd-ask-password-wall.path +%{_systemd_util_dir}/system/systemd-ask-password-wall.service +%{_systemd_util_dir}/system/systemd-backlight@.service +%{_systemd_util_dir}/system/systemd-binfmt.service +%if %{with sd_boot} +%{_systemd_util_dir}/system/systemd-bless-boot.service +%endif +%{_systemd_util_dir}/system/systemd-boot-check-no-failures.service +%if %{with sd_boot} +%{_systemd_util_dir}/system/systemd-boot-system-token.service +%endif +%{_systemd_util_dir}/system/systemd-exit.service +%{_systemd_util_dir}/system/systemd-firstboot.service +%{_systemd_util_dir}/system/systemd-fsck-root.service +%{_systemd_util_dir}/system/systemd-fsck@.service +%{_systemd_util_dir}/system/systemd-halt.service +%{_systemd_util_dir}/system/systemd-hibernate-resume@.service +%{_systemd_util_dir}/system/systemd-hibernate.service +%{_systemd_util_dir}/system/systemd-hostnamed.service +%{_systemd_util_dir}/system/systemd-hybrid-sleep.service +%if %{with sysvcompat} +%{_systemd_util_dir}/system/systemd-initctl.service +%{_systemd_util_dir}/system/systemd-initctl.socket +%endif +%{_systemd_util_dir}/system/systemd-journal-catalog-update.service +%{_systemd_util_dir}/system/systemd-journal-flush.service +%{_systemd_util_dir}/system/systemd-journald-dev-log.socket +%{_systemd_util_dir}/system/systemd-journald-varlink@.socket +%{_systemd_util_dir}/system/systemd-journald.service +%{_systemd_util_dir}/system/systemd-journald.socket +%{_systemd_util_dir}/system/systemd-journald@.service +%{_systemd_util_dir}/system/systemd-journald@.socket +%{_systemd_util_dir}/system/systemd-kexec.service +%{_systemd_util_dir}/system/systemd-localed.service +%{_systemd_util_dir}/system/systemd-logind.service +%{_systemd_util_dir}/system/systemd-machine-id-commit.service +%{_systemd_util_dir}/system/systemd-modules-load.service +%{_systemd_util_dir}/system/systemd-poweroff.service +%{_systemd_util_dir}/system/systemd-quotacheck.service +%{_systemd_util_dir}/system/systemd-random-seed.service +%{_systemd_util_dir}/system/systemd-reboot.service +%{_systemd_util_dir}/system/systemd-remount-fs.service +%{_systemd_util_dir}/system/systemd-rfkill.service +%{_systemd_util_dir}/system/systemd-rfkill.socket +%{_systemd_util_dir}/system/systemd-suspend-then-hibernate.service +%{_systemd_util_dir}/system/systemd-suspend.service +%{_systemd_util_dir}/system/systemd-sysctl.service +%{_systemd_util_dir}/system/systemd-sysext.service +%{_systemd_util_dir}/system/systemd-sysusers.service +%{_systemd_util_dir}/system/systemd-time-wait-sync.service +%{_systemd_util_dir}/system/systemd-timedated.service +%{_systemd_util_dir}/system/systemd-timesyncd.service +%{_systemd_util_dir}/system/systemd-tmpfiles-clean.service +%{_systemd_util_dir}/system/systemd-tmpfiles-clean.timer +%{_systemd_util_dir}/system/systemd-tmpfiles-setup-dev.service +%{_systemd_util_dir}/system/systemd-tmpfiles-setup.service +%{_systemd_util_dir}/system/systemd-update-done.service +%if %{with sysvcompat} +%{_systemd_util_dir}/system/systemd-update-utmp-runlevel.service +%endif +%{_systemd_util_dir}/system/systemd-update-utmp.service +%{_systemd_util_dir}/system/systemd-user-sessions.service +%{_systemd_util_dir}/system/systemd-vconsole-setup.service +%{_systemd_util_dir}/system/systemd-volatile-root.service +%{_systemd_util_dir}/system/time-set.target +%{_systemd_util_dir}/system/time-sync.target +%{_systemd_util_dir}/system/timers.target +%{_systemd_util_dir}/system/timers.target.wants/systemd-tmpfiles-clean.timer +%{_systemd_util_dir}/system/tmp.mount +%{_systemd_util_dir}/system/umount.target +%{_systemd_util_dir}/system/usb-gadget.target +%{_systemd_util_dir}/system/user-.slice.d +%{_systemd_util_dir}/system/user-.slice.d/10-defaults.conf +%{_systemd_util_dir}/system/user-runtime-dir@.service +%{_systemd_util_dir}/system/user.slice +%{_systemd_util_dir}/system/user@.service +%if %{with sysvcompat} +%{_systemd_util_dir}/system/var-lock.mount +%{_systemd_util_dir}/system/var-run.mount +%endif +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/system/veritysetup-pre.target +%{_systemd_util_dir}/system/veritysetup.target +%endif +%{_systemd_util_dir}/systemd +%{_systemd_util_dir}/systemd-ac-power +%{_systemd_util_dir}/systemd-backlight +%{_systemd_util_dir}/systemd-binfmt +%if %{with sd_boot} +%{_systemd_util_dir}/systemd-bless-boot +%endif +%{_systemd_util_dir}/systemd-boot-check-no-failures +%{_systemd_util_dir}/systemd-cgroups-agent +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/systemd-cryptsetup +%endif +%{_systemd_util_dir}/systemd-fsck +%{_systemd_util_dir}/systemd-growfs +%{_systemd_util_dir}/systemd-hibernate-resume +%{_systemd_util_dir}/systemd-hostnamed +%if %{with sysvcompat} +%{_systemd_util_dir}/systemd-initctl +%endif +%{_systemd_util_dir}/systemd-journald +%{_systemd_util_dir}/systemd-localed +%{_systemd_util_dir}/systemd-logind +%{_systemd_util_dir}/systemd-makefs +%{_systemd_util_dir}/systemd-modules-load +%{_systemd_util_dir}/systemd-quotacheck +%{_systemd_util_dir}/systemd-random-seed +%{_systemd_util_dir}/systemd-remount-fs +%{_systemd_util_dir}/systemd-reply-password +%{_systemd_util_dir}/systemd-rfkill +%{_systemd_util_dir}/systemd-shutdown +%{_systemd_util_dir}/systemd-sleep +%{_systemd_util_dir}/systemd-socket-proxyd +%{_systemd_util_dir}/systemd-sulogin-shell +%{_systemd_util_dir}/systemd-sysctl +%if %{with sysvcompat} +%{_systemd_util_dir}/systemd-sysv-convert +%{_systemd_util_dir}/systemd-sysv-install +%endif +%{_systemd_util_dir}/systemd-time-wait-sync +%{_systemd_util_dir}/systemd-timedated +%{_systemd_util_dir}/systemd-timesyncd +%{_systemd_util_dir}/systemd-update-done +%{_systemd_util_dir}/systemd-update-utmp +%{_systemd_util_dir}/systemd-user-runtime-dir +%{_systemd_util_dir}/systemd-user-sessions +%{_systemd_util_dir}/systemd-vconsole-setup +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/systemd-veritysetup +%endif +%{_systemd_util_dir}/systemd-volatile-root +%{_systemd_util_dir}/systemd-xdg-autostart-condition +%{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator +%{_systemd_util_dir}/user-preset/90-systemd.preset +%{_systemd_util_dir}/user-preset/99-default.preset +%{_systemd_util_dir}/user/app.slice +%{_systemd_util_dir}/user/background.slice +%{_systemd_util_dir}/user/basic.target +%{_systemd_util_dir}/user/bluetooth.target +%{_systemd_util_dir}/user/default.target +%{_systemd_util_dir}/user/exit.target +%{_systemd_util_dir}/user/graphical-session-pre.target +%{_systemd_util_dir}/user/graphical-session.target +%{_systemd_util_dir}/user/paths.target +%{_systemd_util_dir}/user/printer.target +%{_systemd_util_dir}/user/session.slice +%{_systemd_util_dir}/user/shutdown.target +%{_systemd_util_dir}/user/smartcard.target +%{_systemd_util_dir}/user/sockets.target +%{_systemd_util_dir}/user/sound.target +%{_systemd_util_dir}/user/systemd-exit.service +%{_systemd_util_dir}/user/systemd-tmpfiles-clean.service +%{_systemd_util_dir}/user/systemd-tmpfiles-clean.timer +%{_systemd_util_dir}/user/systemd-tmpfiles-setup.service +%{_systemd_util_dir}/user/timers.target +%{_systemd_util_dir}/user/xdg-desktop-autostart.target +%if %{with sd_boot} +%{_systemdgeneratordir}/systemd-bless-boot-generator +%endif +%if ! 0%{?bootstrap} +%{_systemdgeneratordir}/systemd-cryptsetup-generator +%endif +%{_systemdgeneratordir}/systemd-debug-generator +%{_systemdgeneratordir}/systemd-fstab-generator +%{_systemdgeneratordir}/systemd-getty-generator +%{_systemdgeneratordir}/systemd-gpt-auto-generator +%{_systemdgeneratordir}/systemd-hibernate-resume-generator +%if %{with sysvcompat} +%{_systemdgeneratordir}/systemd-rc-local-generator +%endif +%{_systemdgeneratordir}/systemd-run-generator +%{_systemdgeneratordir}/systemd-system-update-generator +%if %{with sysvcompat} +%{_systemdgeneratordir}/systemd-sysv-generator +%endif +%if ! 0%{?bootstrap} +%{_systemdgeneratordir}/systemd-veritysetup-generator +%endif +%{_sysusersdir}/systemd.conf +%{_tmpfilesdir}/journal-nocow.conf +%{_tmpfilesdir}/suse.conf +%{_tmpfilesdir}/systemd-nologin.conf +%{_tmpfilesdir}/systemd-tmp.conf +%{_tmpfilesdir}/systemd.conf +%{_tmpfilesdir}/x11.conf +%{_udevrulesdir}/70-uaccess.rules +%{_udevrulesdir}/71-seat.rules +%{_udevrulesdir}/73-seat-late.rules +%{_udevrulesdir}/99-systemd.rules +%if %{with split_usr} +/bin/systemctl +%endif diff --git a/files.udev b/files.udev new file mode 100644 index 00000000..4f75bcc9 --- /dev/null +++ b/files.udev @@ -0,0 +1,126 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/udev/udev.conf +%dir %{_prefix}/lib/udev +%dir %{_sysconfdir}/udev +%dir %{_sysconfdir}/udev/rules.d +%dir %{_systemd_util_dir}/network +%dir %{_udevhwdbdir} +%dir %{_udevrulesdir} +%doc %{_udevhwdbdir}/README +%doc %{_udevrulesdir}/README +%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%{_bindir}/systemd-hwdb +%{_bindir}/udevadm +%if ! 0%{?bootstrap} +%{_datadir}/bash-completion/completions/udevadm +%endif +%{_datadir}/pkgconfig/udev.pc +%if ! 0%{?bootstrap} +%{_datadir}/zsh/site-functions/_udevadm +%endif +%if ! 0%{?bootstrap} +%{_mandir}/man5/udev.conf.5.gz +%{_mandir}/man7/hwdb.7.gz +%{_mandir}/man7/udev.7.gz +%{_mandir}/man8/systemd-hwdb.8.gz +%{_mandir}/man8/systemd-network-generator.8.gz +%{_mandir}/man8/systemd-network-generator.service.8.gz +%{_mandir}/man8/systemd-udev-settle.service.8.gz +%{_mandir}/man8/systemd-udevd-control.socket.8.gz +%{_mandir}/man8/systemd-udevd-kernel.socket.8.gz +%{_mandir}/man8/systemd-udevd.8.gz +%{_mandir}/man8/systemd-udevd.service.8.gz +%{_mandir}/man8/udevadm.8.gz +%endif +%{_prefix}/lib/udev/ata_id +%{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif +%{_prefix}/lib/udev/fido_id +%{_prefix}/lib/udev/mtd_probe +%{_prefix}/lib/udev/path_id_compat +%{_prefix}/lib/udev/scsi_id +%{_prefix}/lib/udev/v4l_id +%{_systemd_util_dir}/network/99-default.link +%{_systemd_util_dir}/systemd-network-generator +%{_systemd_util_dir}/systemd-udevd +%{_tmpfilesdir}/static-nodes-permissions.conf +%{_udevhwdbdir}/20-OUI.hwdb +%{_udevhwdbdir}/20-acpi-vendor.hwdb +%{_udevhwdbdir}/20-bluetooth-vendor-product.hwdb +%{_udevhwdbdir}/20-dmi-id.hwdb +%{_udevhwdbdir}/20-net-ifname.hwdb +%{_udevhwdbdir}/20-pci-classes.hwdb +%{_udevhwdbdir}/20-pci-vendor-model.hwdb +%{_udevhwdbdir}/20-sdio-classes.hwdb +%{_udevhwdbdir}/20-sdio-vendor-model.hwdb +%{_udevhwdbdir}/20-usb-classes.hwdb +%{_udevhwdbdir}/20-usb-vendor-model.hwdb +%{_udevhwdbdir}/20-vmbus-class.hwdb +%{_udevhwdbdir}/60-autosuspend-chromiumos.hwdb +%{_udevhwdbdir}/60-autosuspend-fingerprint-reader.hwdb +%{_udevhwdbdir}/60-autosuspend.hwdb +%{_udevhwdbdir}/60-evdev.hwdb +%{_udevhwdbdir}/60-input-id.hwdb +%{_udevhwdbdir}/60-keyboard.hwdb +%{_udevhwdbdir}/60-seat.hwdb +%{_udevhwdbdir}/60-sensor.hwdb +%{_udevhwdbdir}/70-joystick.hwdb +%{_udevhwdbdir}/70-mouse.hwdb +%{_udevhwdbdir}/70-pointingstick.hwdb +%{_udevhwdbdir}/70-touchpad.hwdb +%{_udevhwdbdir}/80-ieee1394-unit-function.hwdb +%{_udevrulesdir}/50-udev-default.rules +%{_udevrulesdir}/60-autosuspend.rules +%{_udevrulesdir}/60-block.rules +%{_udevrulesdir}/60-cdrom_id.rules +%{_udevrulesdir}/60-drm.rules +%{_udevrulesdir}/60-evdev.rules +%{_udevrulesdir}/60-fido-id.rules +%{_udevrulesdir}/60-input-id.rules +%{_udevrulesdir}/60-persistent-alsa.rules +%{_udevrulesdir}/60-persistent-input.rules +%{_udevrulesdir}/60-persistent-storage-tape.rules +%{_udevrulesdir}/60-persistent-storage.rules +%{_udevrulesdir}/60-persistent-v4l.rules +%{_udevrulesdir}/60-sensor.rules +%{_udevrulesdir}/60-serial.rules +%{_udevrulesdir}/61-persistent-storage-compat.rules +%{_udevrulesdir}/64-btrfs.rules +%{_udevrulesdir}/70-joystick.rules +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_udevrulesdir}/70-memory.rules +%endif +%{_udevrulesdir}/70-mouse.rules +%{_udevrulesdir}/70-power-switch.rules +%{_udevrulesdir}/70-touchpad.rules +%{_udevrulesdir}/75-net-description.rules +%{_udevrulesdir}/75-probe_mtd.rules +%{_udevrulesdir}/78-sound-card.rules +%{_udevrulesdir}/80-drivers.rules +%{_udevrulesdir}/80-net-setup-link.rules +%{_udevrulesdir}/81-net-dhcp.rules +%{_udevrulesdir}/90-vconsole.rules +%{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/kmod-static-nodes.service +%{_unitdir}/sockets.target.wants/systemd-udevd-control.socket +%{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket +%{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service +%{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service +%{_unitdir}/sysinit.target.wants/systemd-udevd.service +%{_unitdir}/systemd-hwdb-update.service +%{_unitdir}/systemd-network-generator.service +%{_unitdir}/systemd-udev-settle.service +%{_unitdir}/systemd-udev-trigger.service +%{_unitdir}/systemd-udevd-control.socket +%{_unitdir}/systemd-udevd-kernel.socket +%{_unitdir}/systemd-udevd.service +%if %{with split_usr} +/sbin/udevadm +%endif diff --git a/systemd.changes b/systemd.changes index 38b6dc6b..c6c4f4b7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jan 24 15:51:07 UTC 2022 - Franck Bui + +- systemd.spec: explicitely list all files for each main (sub) packages + + Using glob patterns in %files section to reduce the number of listed files was + error-prone as some introduced files could silently be placed in the wrong + subpackage. The sections were also hard to read and many files needed to be + excluded from the main package making the point of glob pattern usage moot. + + systemd, udev, systemd-container and systemd-network packages have now their + list of files described in a dedicated file. The lists are kept sorted to make + them easy to parse. The size of the files, especially the one for the main + package, is still reasonable and much easier to read now. + + During this rework, a couple of cleanups happened: more use of + %{_systemd_util_dir}, some files was incorrectly owned by the main package and + have been moved to the correct sub-package, etc... + + Note: the rest of the subpackages might be addressed later but let's find how + it goes for now. + ------------------------------------------------------------------- Wed Jan 19 15:34:05 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a2c4706f..25b2542b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file for package systemd +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -159,12 +159,12 @@ Requires(post): pam-config >= 0.79-5 %endif %if 0%{?bootstrap} -Conflicts: systemd Conflicts: kiwi +Conflicts: systemd %endif -Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 +Conflicts: sysvinit Provides: systemd-logger = %{version}-%{release} Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} @@ -187,6 +187,11 @@ Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh +Source200: files.systemd +Source201: files.udev +Source202: files.container +Source203: files.network + # Patches listed below are SUSE specific and should be kept at its # minimum. We try hard to push our changes to upstream but sometimes # they are only relevant for SUSE distros. Special rewards for those @@ -293,13 +298,13 @@ Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils -Requires(postun): coreutils +Requires(postun):coreutils +Conflicts: ConsoleKit < 0.4.1 +Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Conflicts: dracut < 044.1 Conflicts: util-linux < 2.16 -Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version}-%{release} @@ -320,8 +325,8 @@ call tools to initialize a device, or load needed kernel modules. Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later %if 0%{?bootstrap} -Conflicts: libudev1 Conflicts: kiwi +Conflicts: libudev1 # avoid kiwi picking it for bootstrap Requires: this-is-only-for-build-envs %endif @@ -336,8 +341,8 @@ License: LGPL-2.1-or-later Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} -Conflicts: libudev1 = %{version} Conflicts: libudev-devel +Conflicts: libudev1 = %{version} %endif %description -n libudev%{?mini}-devel @@ -501,11 +506,14 @@ Recommends: dosfstools # host and install them in the image, see install_missing_libraries() # for details. %if %{with resolved} -Requires: libidn2 pkgconfig(libidn2) +Requires: libidn2 +Requires: pkgconfig(libidn2) %endif %if %{with experimental} -Requires: libpwquality1 pkgconfig(pwquality) -Requires: libqrencode4 pkgconfig(libqrencode) +Requires: libpwquality1 +Requires: libqrencode4 +Requires: pkgconfig(libqrencode) +Requires: pkgconfig(pwquality) %endif Requires: %{name} = %{version}-%{release} Requires: attr @@ -514,6 +522,10 @@ Requires: busybox-static Requires: cryptsetup Requires: dosfstools Requires: libcap-progs +Requires: libfido2 +Requires: libtss2-esys0 +Requires: libtss2-mu0 +Requires: libtss2-rc0 Requires: lz4 Requires: make Requires: netcat @@ -522,10 +534,10 @@ Requires: quota Requires: socat Requires: squashfs Requires: systemd-container -Requires: libfido2 pkgconfig(libfido2) -Requires: libtss2-esys0 pkgconfig(tss2-esys) -Requires: libtss2-mu0 pkgconfig(tss2-mu) -Requires: libtss2-rc0 pkgconfig(tss2-rc) +Requires: pkgconfig(libfido2) +Requires: pkgconfig(tss2-esys) +Requires: pkgconfig(tss2-mu) +Requires: pkgconfig(tss2-rc) %if %{with coredump} Requires: systemd-coredump %endif @@ -653,6 +665,8 @@ Have fun with these services at your own risk. -Duserdb=false \ %endif %if 0%{?bootstrap} + -Dbashcompletiondir=no \ + -Dzshcompletiondir=no \ -Dtranslations=false \ -Dnss-myhostname=false \ -Dnss-systemd=false \ @@ -722,8 +736,8 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated -install -m0755 -D %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert -install -m0755 -D %{SOURCE4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-convert +install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install %endif mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network @@ -731,10 +745,12 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't -# allow directory structure... -for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do - install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} -done +# allow directories in the workspace... +%if %{with machined} +install -m0755 -D %{SOURCE100} %{buildroot}%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +%endif +install -m0755 -D %{SOURCE101} %{buildroot}%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh +install -m0755 -D %{SOURCE102} %{buildroot}%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %if %{with split_usr} mkdir -p %{buildroot}/{bin,sbin} @@ -809,10 +825,15 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ mkdir -p %{buildroot}%{_unitdir}/basic.target.wants mkdir -p %{buildroot}%{_unitdir}/default.target.wants mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants +mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants mkdir -p %{buildroot}%{_unitdir}/halt.target.wants +mkdir -p %{buildroot}%{_unitdir}/initrd-root-device.target.wants +mkdir -p %{buildroot}%{_unitdir}/initrd-root-fs.target.wants mkdir -p %{buildroot}%{_unitdir}/kexec.target.wants mkdir -p %{buildroot}%{_unitdir}/poweroff.target.wants mkdir -p %{buildroot}%{_unitdir}/reboot.target.wants +mkdir -p %{buildroot}%{_unitdir}/remote-fs.target.wants +mkdir -p %{buildroot}%{_unitdir}/rescue.target.wants mkdir -p %{buildroot}%{_unitdir}/shutdown.target.wants # Make sure the generator directories are created and properly owned. @@ -1236,331 +1257,21 @@ fi %files %defattr(-,root,root) -%license LICENSE* -%if %{with sd_boot} -%{_bindir}/bootctl +%include %{SOURCE200} + +%files -n udev%{?mini} +%defattr(-,root,root) +%include %{SOURCE201} + +%files container +%defattr(-,root,root) +%include %{SOURCE202} + +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%include %{SOURCE203} %endif -%{_bindir}/busctl -%{_bindir}/hostnamectl -%{_bindir}/kernel-install -%{_bindir}/localectl -%{_bindir}/systemctl -%{_bindir}/systemd-analyze -%if ! 0%{?bootstrap} -%{_bindir}/systemd-cryptenroll -%endif -%{_bindir}/systemd-delta -%{_bindir}/systemd-dissect -%{_bindir}/systemd-escape -%{_bindir}/systemd-firstboot -%{_bindir}/systemd-id128 -%{_bindir}/systemd-path -%{_bindir}/systemd-sysusers -%{_bindir}/systemd-mount -%{_bindir}/systemd-umount -%{_bindir}/systemd-notify -%{_bindir}/systemd-run -%{_bindir}/systemd-sysext -%{_bindir}/journalctl -%{_bindir}/systemd-ask-password -%{_bindir}/loginctl -%{_bindir}/systemd-inhibit -%{_bindir}/systemd-tty-ask-password-agent -%{_bindir}/systemd-tmpfiles -%{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-socket-activate -%{_bindir}/systemd-stdio-bridge -%{_bindir}/systemd-detect-virt -%{_bindir}/timedatectl -%{_bindir}/systemd-cgls -%{_bindir}/systemd-cgtop -%{_bindir}/systemd-cat -%if %{with split_usr} -/bin/systemctl -%endif -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d -%{_prefix}/lib/kernel/install.d/00-entry-directory.install -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install -%dir %{_prefix}/lib/systemd -%dir %{_prefix}/lib/systemd/network -%dir %{_unitdir} -%{_userunitdir} -%exclude %{_prefix}/lib/systemd/systemd-network-generator -%exclude %{_unitdir}/systemd-network-generator.service -%if %{with coredump} -%exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_unitdir}/systemd-coredump* -%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket -%endif -%if %{with journal_remote} -%exclude %{_unitdir}/systemd-journal-gatewayd.* -%exclude %{_unitdir}/systemd-journal-remote.* -%exclude %{_unitdir}/systemd-journal-upload.* -%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd -%exclude %{_prefix}/lib/systemd/systemd-journal-remote -%exclude %{_prefix}/lib/systemd/systemd-journal-upload -%exclude %{_datadir}/systemd/gatewayd -%endif -%exclude %{_prefix}/lib/systemd/systemd-udevd -%exclude %{_unitdir}/systemd-udev*.* -%exclude %{_unitdir}/systemd-hwdb*.* -%exclude %{_unitdir}/*.target.wants/systemd-udev*.* -%exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* -%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service -%exclude %{_unitdir}/kmod-static-nodes.service -%exclude %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service -%exclude %{_tmpfilesdir}/static-nodes-permissions.conf -%exclude %{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%exclude %{_prefix}/lib/systemd/systemd-machined -%exclude %{_unitdir}/systemd-machined.service -%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service -%exclude %{_unitdir}/var-lib-machines.mount -%exclude %{_unitdir}/machine.slice -%exclude %{_unitdir}/machines.target.wants -%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount -%endif -%if %{with importd} -%exclude %{_prefix}/lib/systemd/systemd-import* -%exclude %{_prefix}/lib/systemd/systemd-pull -%exclude %{_prefix}/lib/systemd/import-pubring.gpg -%exclude %{_unitdir}/systemd-importd.service -%exclude %{_unitdir}/dbus-org.freedesktop.import1.service -%endif -%if %{with networkd} -%exclude %{_prefix}/lib/systemd/systemd-networkd -%exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online -%exclude %{_unitdir}/systemd-networkd.service -%exclude %{_unitdir}/systemd-networkd.socket -%exclude %{_unitdir}/systemd-networkd-wait-online.service -%exclude %{_prefix}/lib/systemd/systemd-resolved -%exclude %{_unitdir}/systemd-resolved.service -%endif -%if %{with portabled} -%exclude %{_prefix}/lib/systemd/systemd-portabled -%exclude %{_prefix}/lib/systemd/portable -%exclude %{_unitdir}/systemd-portabled.service -%exclude %{_unitdir}/dbus-org.freedesktop.portable1.service -%exclude %{_tmpfilesdir}/portables.conf -%endif -%if %{with experimental} -%exclude %{_prefix}/lib/systemd/systemd-pstore -%exclude %{_unitdir}/systemd-pstore.service -%exclude %{_tmpfilesdir}/systemd-pstore.conf -%exclude %{_unitdir}/systemd-repart.service -%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service -%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service -%exclude %{_prefix}/lib/systemd/systemd-userwork -%exclude %{_prefix}/lib/systemd/systemd-userdbd -%exclude %{_unitdir}/systemd-userdbd.service -%exclude %{_unitdir}/systemd-userdbd.socket -%exclude %{_prefix}/lib/systemd/systemd-homed -%exclude %{_prefix}/lib/systemd/systemd-homework -%exclude %{_unitdir}/systemd-homed-activate.service -%exclude %{_unitdir}/systemd-homed.service -%endif - -%{_unitdir}/*.automount -%{_unitdir}/*.service -%{_unitdir}/*.slice -%{_unitdir}/*.target -%{_unitdir}/*.mount -%{_unitdir}/*.timer -%{_unitdir}/*.socket -%{_unitdir}/*.wants -%{_unitdir}/*.path - -%{_unitdir}/user-.slice.d/ - -%{_prefix}/lib/systemd/systemd-* -%{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-*.so -%{_prefix}/lib/systemd/scripts -%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%dir %{_journalcatalogdir} -%{_journalcatalogdir}/systemd.catalog -%{_journalcatalogdir}/systemd.*.catalog -%{_presetdir} -%{_userpresetdir} -%{_systemdgeneratordir} -%{_systemdusergeneratordir} -%{_systemd_system_env_generator_dir} -%{_systemd_user_env_generator_dir} -%dir %{_ntpunitsdir} -%{_ntpunitsdir}/80-systemd-timesync.list -%dir %{_prefix}/lib/systemd/system-shutdown/ -%dir %{_prefix}/lib/systemd/system-sleep/ - -%{_pam_moduledir}/pam_systemd.so - -%if %{with sd_boot} -%dir %{_prefix}/lib/systemd/boot -%dir %{_prefix}/lib/systemd/boot/efi -%{_prefix}/lib/systemd/boot/efi/*.efi -%{_prefix}/lib/systemd/boot/efi/*.stub -%endif - -%dir %{_sysconfdir}/modules-load.d -%{_modulesloaddir} - -%dir %{_sysusersdir} -%doc %{_sysusersdir}/README -%{_sysusersdir}/systemd.conf - -%dir %{_sysconfdir}/tmpfiles.d -%{_tmpfilesdir}/ -%exclude %{_tmpfilesdir}/systemd-nspawn.conf - -%{_environmentdir}/ - -%dir %{_binfmtdir} -%dir %{_sysconfdir}/binfmt.d - -%dir %{_sysctldir} -%dir %{_sysconfdir}/sysctl.d -%doc %{_sysctldir}/README -%{_sysctldir}/99-sysctl.conf - -%dir %{_sysconfdir}/X11/xorg.conf.d -%dir %{_sysconfdir}/systemd -%dir %{_sysconfdir}/systemd/network -%dir %{_sysconfdir}/systemd/system -%dir %{_sysconfdir}/systemd/user -%dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/xdg/systemd/user - -%dir %{_distconfdir}/X11/xinit -%dir %{_distconfdir}/X11/xinit/xinitrc.d -%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh - -%{_pam_vendordir}/systemd-user - -%config(noreplace) %{_sysconfdir}/systemd/journald.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf -%config(noreplace) %{_sysconfdir}/systemd/sleep.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/user.conf - -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/dbus-1/system.d -%dir %{_datadir}/dbus-1/system-services - -%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf -%{_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 - -# FIXME: why do we have to own this dir ? -%dir %{_modprobedir} -%doc %{_modprobedir}/README -%{_modprobedir}/systemd.conf - -# Some files created at runtime. -%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ -%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf -%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf -%ghost %config(noreplace) %{_sysconfdir}/locale.conf -%ghost %config(noreplace) %{_sysconfdir}/machine-info -%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id - -%{_datadir}/systemd -%{_datadir}/factory - -%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service -%{_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 - -%dir %{_datadir}/polkit-1 -%dir %{_datadir}/polkit-1/actions -%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy -%{_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 ! 0%{?bootstrap} -%{_mandir}/man1/[a-rt-z]*ctl.1* -%{_mandir}/man1/systemc*.1* -%{_mandir}/man1/systemd*.1* -%{_mandir}/man5/[a-tv-z]* -%{_mandir}/man5/user* -%{_mandir}/man7/[bdfks]* -%{_mandir}/man8/kern* -%{_mandir}/man8/pam_* -%{_mandir}/man8/rc-local.* -%{_mandir}/man8/systemd-[a-gik-tvx]* -%{_mandir}/man8/systemd-h[aioy]* -%{_mandir}/man8/systemd-journald* -%{_mandir}/man8/systemd-u[ps]* -%{_mandir}/man8/30-systemd-environment-d-generator.* -%exclude %{_mandir}/man8/systemd-network-generator.* -%if %{with coredump} -%exclude %{_mandir}/man1/coredumpctl* -%exclude %{_mandir}/man5/coredump.conf* -%exclude %{_mandir}/man8/systemd-coredump* -%endif -%exclude %{_mandir}/man*/*nspawn* -%if %{with machined} -%exclude %{_mandir}/man*/machinectl* -%exclude %{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%exclude %{_mandir}/man*/systemd-importd* -%endif -%if %{with journal_remote} -%exclude %{_mandir}/man5/journal-remote.conf* -%exclude %{_mandir}/man5/journal-upload.conf* -%endif -%if %{with portabled} -%exclude %{_mandir}/man*/portablectl* -%exclude %{_mandir}/man*/systemd-portabled* -%endif -%if %{with experimental} -%exclude %{_mandir}/man*/*pstore* -%exclude %{_mandir}/man*/*repart* -%exclude %{_mandir}/man*/userdbctl* -%exclude %{_mandir}/man*/systemd-userdbd* -%exclude %{_mandir}/man*/*homectl* -%exclude %{_mandir}/man*/*homed* -%exclude %{_mandir}/man*/org.freedesktop.home1* -%exclude %{_mandir}/man*/pam_systemd_home* -%exclude %{_datadir}/bash-completion/completions/homectl -%endif -%endif - -%{_udevrulesdir}/70-uaccess.rules -%{_udevrulesdir}/71-seat.rules -%{_udevrulesdir}/73-seat-late.rules -%{_udevrulesdir}/99-systemd.rules -%dir %{_localstatedir}/lib/systemd -%dir %{_localstatedir}/lib/systemd/catalog -%if %{with sysvcompat} -%dir %{_localstatedir}/lib/systemd/sysv-convert -%dir %{_localstatedir}/lib/systemd/migrated -%endif -%ghost %{_localstatedir}/lib/systemd/catalog/database -%ghost %{_localstatedir}/lib/systemd/backlight -%ghost %{_localstatedir}/lib/systemd/i18n-migrated -%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed - -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/* - -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/* -%{_datadir}/pkgconfig/systemd.pc %files doc %defattr(-,root,root,-) @@ -1579,102 +1290,44 @@ fi %files sysvinit %defattr(-,root,root,-) %if %{with split_usr} -/sbin/init -/sbin/reboot /sbin/halt -/sbin/shutdown +/sbin/init /sbin/poweroff +/sbin/reboot +/sbin/shutdown %if %{with sysvcompat} /sbin/telinit /sbin/runlevel %endif %endif -%{_sbindir}/init -%{_sbindir}/reboot %{_sbindir}/halt -%{_sbindir}/shutdown +%{_sbindir}/init %{_sbindir}/poweroff +%{_sbindir}/reboot +%{_sbindir}/shutdown %if %{with sysvcompat} -%{_sbindir}/telinit %{_sbindir}/runlevel +%{_sbindir}/telinit %endif %if ! 0%{?bootstrap} -%{_mandir}/man1/init.1* -%{_mandir}/man8/halt.8* -%{_mandir}/man8/reboot.8* -%{_mandir}/man8/shutdown.8* -%{_mandir}/man8/poweroff.8* -%{_mandir}/man8/telinit.8* -%{_mandir}/man8/runlevel.8* -%endif - -%files -n udev%{?mini} -%defattr(-,root,root) -%{_bindir}/udevadm -%{_bindir}/systemd-hwdb -%if %{with split_usr} -/sbin/udevadm -%endif -%dir %{_prefix}/lib/udev/ -%{_prefix}/lib/udev/ata_id -%{_prefix}/lib/udev/cdrom_id -# dmi_memory_id is only relevant on arches with DMI -%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips -%{_prefix}/lib/udev/dmi_memory_id -%endif -%{_prefix}/lib/udev/fido_id -%{_prefix}/lib/udev/mtd_probe -%{_prefix}/lib/udev/path_id_compat -%{_prefix}/lib/udev/scsi_id -%{_prefix}/lib/udev/v4l_id -%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation -%{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/systemd-network-generator -%dir %{_udevrulesdir}/ -%doc %{_udevrulesdir}/README -%exclude %{_udevrulesdir}/70-uaccess.rules -%exclude %{_udevrulesdir}/71-seat.rules -%exclude %{_udevrulesdir}/73-seat-late.rules -%exclude %{_udevrulesdir}/99-systemd.rules -%{_udevrulesdir}/*.rules -%{_udevhwdbdir}/ -%dir %{_sysconfdir}/udev/ -%dir %{_sysconfdir}/udev/rules.d/ -%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin -%config(noreplace) %{_sysconfdir}/udev/udev.conf -%dir %{_unitdir} -%{_unitdir}/kmod-static-nodes.service -%{_unitdir}/sysinit.target.wants/kmod-static-nodes.service -%{_tmpfilesdir}/static-nodes-permissions.conf -%{_unitdir}/systemd-udev*.service -%{_unitdir}/systemd-udevd*.socket -%{_unitdir}/systemd-hwdb*.* -%{_unitdir}/initrd-udevadm-cleanup-db.service -%{_unitdir}/systemd-network-generator.service -%dir %{_unitdir}/sysinit.target.wants -%{_unitdir}/sysinit.target.wants/systemd-udev*.service -%dir %{_unitdir}/sockets.target.wants -%{_unitdir}/sockets.target.wants/systemd-udev*.socket -%{_unitdir}/*.target.wants/systemd-hwdb*.* -%{_prefix}/lib/systemd/network/99-default.link -%{_datadir}/pkgconfig/udev.pc -%if ! 0%{?bootstrap} -%{_mandir}/man5/udev* -%{_mandir}/man7/hwdb* -%{_mandir}/man7/udev* -%{_mandir}/man8/systemd-hwdb* -%{_mandir}/man8/systemd-udev* -%{_mandir}/man8/udev* -%{_mandir}/man8/systemd-network-generator.* +%{_mandir}/man1/init.1.gz +%{_mandir}/man8/halt.8.gz +%{_mandir}/man8/poweroff.8.gz +%{_mandir}/man8/reboot.8.gz +%{_mandir}/man8/runlevel.8.gz +%{_mandir}/man8/shutdown.8.gz +%{_mandir}/man8/telinit.8.gz %endif %files -n libsystemd0%{?mini} %defattr(-,root,root) -%{_libdir}/libsystemd.so.* +%{_libdir}/libsystemd.so.0 +%{_libdir}/libsystemd.so.0.32.0 %files -n libudev%{?mini}1 %defattr(-,root,root) -%{_libdir}/libudev.so.* +%{_libdir}/libudev.so.1 +%{_libdir}/libudev.so.1.7.2 %files -n libudev%{?mini}-devel %defattr(-,root,root) @@ -1702,47 +1355,6 @@ fi %endif %endif -%files container -%defattr(-,root,root) -%dir %{_sysconfdir}/systemd/nspawn -%{_bindir}/systemd-nspawn -%{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%{_bindir}/machinectl -%{_prefix}/lib/systemd/systemd-machined -%{_unitdir}/systemd-machined.service -%{_unitdir}/dbus-org.freedesktop.machine1.service -%{_unitdir}/var-lib-machines.mount -%{_unitdir}/machine.slice -%{_unitdir}/machines.target.wants -%{_unitdir}/*.target.wants/var-lib-machines.mount -%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%{_tmpfilesdir}/systemd-nspawn.conf -%endif -%if %{with importd} -%{_prefix}/lib/systemd/systemd-import* -%{_prefix}/lib/systemd/systemd-pull -%{_prefix}/lib/systemd/import-pubring.gpg -%{_unitdir}/systemd-importd.service -%{_unitdir}/dbus-org.freedesktop.import1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif -%if ! 0%{?bootstrap} -%{_mandir}/man*/*nspawn* -%if %{with machined} -%{_mandir}/man*/machinectl* -%{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%{_mandir}/man*/systemd-importd* -%endif -%endif - %if ! 0%{?bootstrap} %files lang -f systemd.lang @@ -1796,37 +1408,6 @@ fi %ghost %dir %{_localstatedir}/log/journal/remote %endif -%if %{with networkd} || %{with resolved} -%files network -%defattr(-,root,root) -%if %{with networkd} -%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/*.network -%{_prefix}/lib/systemd/network/*.network.example -%{_prefix}/lib/systemd/systemd-networkd -%{_prefix}/lib/systemd/systemd-networkd-wait-online -%{_unitdir}/systemd-networkd.service -%{_unitdir}/systemd-networkd.socket -%{_unitdir}/systemd-networkd-wait-online.service -%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 -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service -%endif -%endif - %if %{with portabled} %files portable %defattr(-,root,root) @@ -1846,8 +1427,8 @@ fi %if %{with testsuite} %files testsuite %defattr(-,root,root) -%{_testsuitedir} %doc %{_testsuitedir}/test/README.testsuite +%{_testsuitedir} %endif %if %{with experimental} @@ -1864,6 +1445,8 @@ fi %{_bindir}/userdbctl %{_prefix}/lib/systemd/systemd-userwork %{_prefix}/lib/systemd/systemd-userdbd +%{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket %{_mandir}/man*/userdbctl* From 48ed358dfb3e0ecf4c8806d480158a2b155e7de5d473f9eeb1fbde3455b45b4d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 26 Jan 2022 15:32:02 +0000 Subject: [PATCH 04/19] - resolved: disable DNSSEC until the following issue is solved: https://github.com/systemd/systemd/issues/10579 - Replace '%setup+%autopatch' with '%autosetup' OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1232 --- systemd.changes | 8 ++++++++ systemd.spec | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/systemd.changes b/systemd.changes index c6c4f4b7..d80c30e0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 26 15:20:57 UTC 2022 - Franck Bui + +- resolved: disable DNSSEC until the following issue is solved: + https://github.com/systemd/systemd/issues/10579 + +- Replace '%setup+%autopatch' with '%autosetup' + ------------------------------------------------------------------- Mon Jan 24 15:51:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 25b2542b..7f248fdd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -619,8 +619,7 @@ Have fun with these services at your own risk. %endif %prep -%setup -q -n systemd-v%{version}%{suse_version} -%autopatch -p1 +%autosetup -p1 -n systemd-v%{version}%{suse_version} %build # keep split-usr until all packages have moved their systemd rules to /usr @@ -702,6 +701,9 @@ Have fun with these services at your own risk. %endif %if %{without resolved} -Dresolve=false \ +%else + -Ddefault-dnssec=no \ + -Ddns-over-tls=openssl \ %endif %if %{without sysvcompat} -Dsysvinit-path= \ From e444aad0accb3321a263a15ce19c9e62d52b9b5cba144290a03eca7ea85f6d54 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 26 Jan 2022 17:03:49 +0000 Subject: [PATCH 05/19] Document bsc#1192637 in the changelogs OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1233 --- systemd.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systemd.changes b/systemd.changes index d80c30e0..0bcbd1fa 100644 --- a/systemd.changes +++ b/systemd.changes @@ -649,6 +649,9 @@ Mon May 10 13:12:56 UTC 2021 - Franck Bui - Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) + 2c8ec0095e udev/net_id: don't generate slot based names if multiple devices might claim the same slot (bsc#1192637) + [...] + For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a547357ae7d...6f5c11b28f5739b901390f22c2bf4c003cadedaa From 32caedbc1048cd52d5a7380dc8f0994b2f60565457634932e46770d87cde28b3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 26 Jan 2022 17:34:15 +0000 Subject: [PATCH 06/19] - resolved: disable fallback DNS servers and fail when no DNS server info could be obtained from the links. It's better to let the sysadmin know that something is likely misconfigured rather than silently handing over the DNS queries to Google or Cloudflare. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1234 --- systemd.changes | 8 ++++++++ systemd.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/systemd.changes b/systemd.changes index 0bcbd1fa..3caf8209 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 26 17:34:28 UTC 2022 - Franck Bui + +- resolved: disable fallback DNS servers and fail when no DNS server info could + be obtained from the links. It's better to let the sysadmin know that + something is likely misconfigured rather than silently handing over the DNS + queries to Google or Cloudflare. + ------------------------------------------------------------------- Wed Jan 26 15:20:57 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 7f248fdd..cbcae9fc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -702,6 +702,7 @@ Have fun with these services at your own risk. %if %{without resolved} -Dresolve=false \ %else + -Ddns-servers='' \ -Ddefault-dnssec=no \ -Ddns-over-tls=openssl \ %endif From f29e9403599e910e4db7d8432ffb57f4d0b85d63ed26e34dd0f8c12805a86010 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 27 Jan 2022 07:49:42 +0000 Subject: [PATCH 07/19] - Make sure that libopenssl-devel is installed when building resolved. Openssl was implictly pulled in by systemd-experimental subpackage but could be missing if the build of this subpackage was disabled. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1235 --- systemd.changes | 7 +++++++ systemd.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/systemd.changes b/systemd.changes index 3caf8209..dca3a6f6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 27 07:50:07 UTC 2022 - Franck Bui + +- Make sure that libopenssl-devel is installed when building resolved. Openssl + was implictly pulled in by systemd-experimental subpackage but could be + missing if the build of this subpackage was disabled. + ------------------------------------------------------------------- Wed Jan 26 17:34:28 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index cbcae9fc..c3725bda 100644 --- a/systemd.spec +++ b/systemd.spec @@ -388,6 +388,7 @@ Requires: %{name} = %{version}-%{release} # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(openssl) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved From ea1914fbfe7fca9c1de4c3bc4c40f5207845fd3f351a30e12e7d18d95fea493c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 27 Jan 2022 16:09:21 +0000 Subject: [PATCH 08/19] - Merge libudev-devel into systemd-devel OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1236 --- baselibs.conf | 1 - systemd.changes | 5 +++++ systemd.spec | 46 ++++++++++++++-------------------------------- 3 files changed, 19 insertions(+), 33 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 073ad0e1..04045353 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,6 +8,5 @@ systemd post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 -libudev-devel nss-myhostname nss-mymachines diff --git a/systemd.changes b/systemd.changes index dca3a6f6..deb1a238 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 27 10:50:50 UTC 2022 - Franck Bui + +- Merge libudev-devel into systemd-devel + ------------------------------------------------------------------- Thu Jan 27 07:50:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c3725bda..3f5c461e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -191,6 +191,7 @@ Source200: files.systemd Source201: files.udev Source202: files.container Source203: files.network +Source204: files.devel # Patches listed below are SUSE specific and should be kept at its # minimum. We try hard to push our changes to upstream but sometimes @@ -235,16 +236,23 @@ Supplements: (systemd and patterns-base-documentation) The HTML documentation for systemd. %package devel -Summary: Development headers for systemd +Summary: Development files for libsystemd and libudev License: LGPL-2.1-or-later Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros +Provides: libudev%{?mini}-devel = %{version}-%{release} +Obsoletes: libudev%{?mini}-devel < %{version}-%{release} %if 0%{?bootstrap} +Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel +Provides: libudev-devel = %{version}-%{release} +Conflicts: libudev-devel %endif %description devel -Development headers and auxiliary files for developing applications for systemd. +Development headers and files for libsystemd and libudev libraries. These files +are useful for developing applications linking to these libraries. %package sysvinit Summary: System V init tools @@ -335,20 +343,6 @@ Requires: this-is-only-for-build-envs This package contains the dynamic library libudev, which provides access to udev device information -%package -n libudev%{?mini}-devel -Summary: Development files for libudev -License: LGPL-2.1-or-later -Requires: libudev%{?mini}1 = %{version}-%{release} -%if 0%{?bootstrap} -Provides: libudev-devel = %{version}-%{version} -Conflicts: libudev-devel -Conflicts: libudev1 = %{version} -%endif - -%description -n libudev%{?mini}-devel -This package contains the development files for the library libudev, a -dynamic library, which provides access to udev device information. - %if %{with coredump} %package coredump Summary: Systemd tools for coredump management @@ -1283,13 +1277,8 @@ fi %files devel %defattr(-,root,root,-) -%{_libdir}/libsystemd.so -%{_libdir}/pkgconfig/libsystemd.pc -%{_includedir}/systemd/ -%if ! 0%{?bootstrap} -%{_mandir}/man3/SD*.3* -%{_mandir}/man3/sd*.3* -%endif +%license LICENSE.LGPL2.1 +%include %{SOURCE204} %files sysvinit %defattr(-,root,root,-) @@ -1325,23 +1314,16 @@ fi %files -n libsystemd0%{?mini} %defattr(-,root,root) +%license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 %{_libdir}/libsystemd.so.0.32.0 %files -n libudev%{?mini}1 %defattr(-,root,root) +%license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 %{_libdir}/libudev.so.1.7.2 -%files -n libudev%{?mini}-devel -%defattr(-,root,root) -%{_includedir}/libudev.h -%{_libdir}/libudev.so -%{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} -%{_mandir}/man3/*udev*.3* -%endif - %if %{with coredump} %files coredump %defattr(-,root,root) From fb4acfad52f0db46f45c83f3bcc031ae27b3b615a704dc3206b5c330c6136bc6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 28 Jan 2022 13:08:48 +0000 Subject: [PATCH 09/19] Fix previous commit: files.devel was forgotten OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1237 --- files.devel | 729 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 729 insertions(+) create mode 100644 files.devel diff --git a/files.devel b/files.devel new file mode 100644 index 00000000..e551dc7f --- /dev/null +++ b/files.devel @@ -0,0 +1,729 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%{_includedir}/libudev.h +%{_includedir}/systemd/ +%{_libdir}/libsystemd.so +%{_libdir}/libudev.so +%{_libdir}/pkgconfig/libsystemd.pc +%{_libdir}/pkgconfig/libudev.pc +%if ! 0%{?bootstrap} +%{_mandir}/man3/SD_ALERT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_AUTH_FAILED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_BAD_ADDRESS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_DISCONNECTED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_END.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FAILED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FILE_EXISTS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FILE_NOT_FOUND.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INCONSISTENT_MESSAGE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INVALID_ARGS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INVALID_SIGNATURE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_IO_ERROR.3.gz +%{_mandir}/man3/SD_BUS_ERROR_LIMITS_EXCEEDED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MAKE_CONST.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MAP.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MATCH_RULE_INVALID.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MATCH_RULE_NOT_FOUND.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NAME_HAS_NO_OWNER.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NOT_SUPPORTED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_MEMORY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_NETWORK.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_REPLY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_SERVER.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NULL.3.gz +%{_mandir}/man3/SD_BUS_ERROR_PROPERTY_READ_ONLY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_SERVICE_UNKNOWN.3.gz +%{_mandir}/man3/SD_BUS_ERROR_TIMEOUT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_INTERFACE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_METHOD.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_OBJECT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_PROPERTY.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_CALL.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_ERROR.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_RETURN.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_SIGNAL.3.gz +%{_mandir}/man3/SD_BUS_METHOD.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_NAMES_OFFSET.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_OFFSET.3.gz +%{_mandir}/man3/SD_BUS_PARAM.3.gz +%{_mandir}/man3/SD_BUS_PROPERTY.3.gz +%{_mandir}/man3/SD_BUS_SIGNAL.3.gz +%{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_END.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_START.3.gz +%{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz +%{_mandir}/man3/SD_CRIT.3.gz +%{_mandir}/man3/SD_DEBUG.3.gz +%{_mandir}/man3/SD_EMERG.3.gz +%{_mandir}/man3/SD_ERR.3.gz +%{_mandir}/man3/SD_EVENT_ARMED.3.gz +%{_mandir}/man3/SD_EVENT_EXITING.3.gz +%{_mandir}/man3/SD_EVENT_FINISHED.3.gz +%{_mandir}/man3/SD_EVENT_INITIAL.3.gz +%{_mandir}/man3/SD_EVENT_OFF.3.gz +%{_mandir}/man3/SD_EVENT_ON.3.gz +%{_mandir}/man3/SD_EVENT_ONESHOT.3.gz +%{_mandir}/man3/SD_EVENT_PENDING.3.gz +%{_mandir}/man3/SD_EVENT_PREPARING.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_IDLE.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_IMPORTANT.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_NORMAL.3.gz +%{_mandir}/man3/SD_EVENT_RUNNING.3.gz +%{_mandir}/man3/SD_HWDB_FOREACH_PROPERTY.3.gz +%{_mandir}/man3/SD_ID128_ALLF.3.gz +%{_mandir}/man3/SD_ID128_CONST_STR.3.gz +%{_mandir}/man3/SD_ID128_FORMAT_STR.3.gz +%{_mandir}/man3/SD_ID128_FORMAT_VAL.3.gz +%{_mandir}/man3/SD_ID128_MAKE.3.gz +%{_mandir}/man3/SD_ID128_MAKE_STR.3.gz +%{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz +%{_mandir}/man3/SD_ID128_NULL.3.gz +%{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz +%{_mandir}/man3/SD_INFO.3.gz +%{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz +%{_mandir}/man3/SD_JOURNAL_APPEND.3.gz +%{_mandir}/man3/SD_JOURNAL_CURRENT_USER.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_BACKWARDS.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_DATA.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_FIELD.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_UNIQUE.3.gz +%{_mandir}/man3/SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE.3.gz +%{_mandir}/man3/SD_JOURNAL_INVALIDATE.3.gz +%{_mandir}/man3/SD_JOURNAL_LOCAL_ONLY.3.gz +%{_mandir}/man3/SD_JOURNAL_NOP.3.gz +%{_mandir}/man3/SD_JOURNAL_OS_ROOT.3.gz +%{_mandir}/man3/SD_JOURNAL_RUNTIME_ONLY.3.gz +%{_mandir}/man3/SD_JOURNAL_SUPPRESS_LOCATION.3.gz +%{_mandir}/man3/SD_JOURNAL_SYSTEM.3.gz +%{_mandir}/man3/SD_LISTEN_FDS_START.3.gz +%{_mandir}/man3/SD_NOTICE.3.gz +%{_mandir}/man3/SD_WARNING.3.gz +%{_mandir}/man3/libudev.3.gz +%{_mandir}/man3/sd-bus-errors.3.gz +%{_mandir}/man3/sd-bus.3.gz +%{_mandir}/man3/sd-daemon.3.gz +%{_mandir}/man3/sd-event.3.gz +%{_mandir}/man3/sd-hwdb.3.gz +%{_mandir}/man3/sd-id128.3.gz +%{_mandir}/man3/sd-journal.3.gz +%{_mandir}/man3/sd-login.3.gz +%{_mandir}/man3/sd_booted.3.gz +%{_mandir}/man3/sd_bus_add_fallback.3.gz +%{_mandir}/man3/sd_bus_add_fallback_vtable.3.gz +%{_mandir}/man3/sd_bus_add_filter.3.gz +%{_mandir}/man3/sd_bus_add_match.3.gz +%{_mandir}/man3/sd_bus_add_match_async.3.gz +%{_mandir}/man3/sd_bus_add_node_enumerator.3.gz +%{_mandir}/man3/sd_bus_add_object.3.gz +%{_mandir}/man3/sd_bus_add_object_manager.3.gz +%{_mandir}/man3/sd_bus_add_object_vtable.3.gz +%{_mandir}/man3/sd_bus_attach_event.3.gz +%{_mandir}/man3/sd_bus_call.3.gz +%{_mandir}/man3/sd_bus_call_async.3.gz +%{_mandir}/man3/sd_bus_call_method.3.gz +%{_mandir}/man3/sd_bus_call_method_async.3.gz +%{_mandir}/man3/sd_bus_call_method_asyncv.3.gz +%{_mandir}/man3/sd_bus_call_methodv.3.gz +%{_mandir}/man3/sd_bus_can_send.3.gz +%{_mandir}/man3/sd_bus_close.3.gz +%{_mandir}/man3/sd_bus_close_unref.3.gz +%{_mandir}/man3/sd_bus_close_unrefp.3.gz +%{_mandir}/man3/sd_bus_creds_get_audit_login_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_audit_session_id.3.gz +%{_mandir}/man3/sd_bus_creds_get_augmented_mask.3.gz +%{_mandir}/man3/sd_bus_creds_get_cgroup.3.gz +%{_mandir}/man3/sd_bus_creds_get_cmdline.3.gz +%{_mandir}/man3/sd_bus_creds_get_comm.3.gz +%{_mandir}/man3/sd_bus_creds_get_description.3.gz +%{_mandir}/man3/sd_bus_creds_get_egid.3.gz +%{_mandir}/man3/sd_bus_creds_get_euid.3.gz +%{_mandir}/man3/sd_bus_creds_get_exe.3.gz +%{_mandir}/man3/sd_bus_creds_get_fsgid.3.gz +%{_mandir}/man3/sd_bus_creds_get_fsuid.3.gz +%{_mandir}/man3/sd_bus_creds_get_gid.3.gz +%{_mandir}/man3/sd_bus_creds_get_mask.3.gz +%{_mandir}/man3/sd_bus_creds_get_owner_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_pid.3.gz +%{_mandir}/man3/sd_bus_creds_get_ppid.3.gz +%{_mandir}/man3/sd_bus_creds_get_selinux_context.3.gz +%{_mandir}/man3/sd_bus_creds_get_session.3.gz +%{_mandir}/man3/sd_bus_creds_get_sgid.3.gz +%{_mandir}/man3/sd_bus_creds_get_slice.3.gz +%{_mandir}/man3/sd_bus_creds_get_suid.3.gz +%{_mandir}/man3/sd_bus_creds_get_supplementary_gids.3.gz +%{_mandir}/man3/sd_bus_creds_get_tid.3.gz +%{_mandir}/man3/sd_bus_creds_get_tid_comm.3.gz +%{_mandir}/man3/sd_bus_creds_get_tty.3.gz +%{_mandir}/man3/sd_bus_creds_get_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_unique_name.3.gz +%{_mandir}/man3/sd_bus_creds_get_unit.3.gz +%{_mandir}/man3/sd_bus_creds_get_user_slice.3.gz +%{_mandir}/man3/sd_bus_creds_get_user_unit.3.gz +%{_mandir}/man3/sd_bus_creds_get_well_known_names.3.gz +%{_mandir}/man3/sd_bus_creds_has_bounding_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_effective_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_inheritable_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_permitted_cap.3.gz +%{_mandir}/man3/sd_bus_creds_new_from_pid.3.gz +%{_mandir}/man3/sd_bus_creds_ref.3.gz +%{_mandir}/man3/sd_bus_creds_unref.3.gz +%{_mandir}/man3/sd_bus_creds_unrefp.3.gz +%{_mandir}/man3/sd_bus_default.3.gz +%{_mandir}/man3/sd_bus_default_flush_close.3.gz +%{_mandir}/man3/sd_bus_default_system.3.gz +%{_mandir}/man3/sd_bus_default_user.3.gz +%{_mandir}/man3/sd_bus_destroy_t.3.gz +%{_mandir}/man3/sd_bus_detach_event.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_added.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_added_strv.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_removed.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_removed_strv.3.gz +%{_mandir}/man3/sd_bus_emit_object_added.3.gz +%{_mandir}/man3/sd_bus_emit_object_removed.3.gz +%{_mandir}/man3/sd_bus_emit_properties_changed.3.gz +%{_mandir}/man3/sd_bus_emit_properties_changed_strv.3.gz +%{_mandir}/man3/sd_bus_emit_signal.3.gz +%{_mandir}/man3/sd_bus_emit_signalv.3.gz +%{_mandir}/man3/sd_bus_enqueue_for_read.3.gz +%{_mandir}/man3/sd_bus_error.3.gz +%{_mandir}/man3/sd_bus_error_add_map.3.gz +%{_mandir}/man3/sd_bus_error_copy.3.gz +%{_mandir}/man3/sd_bus_error_free.3.gz +%{_mandir}/man3/sd_bus_error_get_errno.3.gz +%{_mandir}/man3/sd_bus_error_has_name.3.gz +%{_mandir}/man3/sd_bus_error_has_names.3.gz +%{_mandir}/man3/sd_bus_error_has_names_sentinel.3.gz +%{_mandir}/man3/sd_bus_error_is_set.3.gz +%{_mandir}/man3/sd_bus_error_map.3.gz +%{_mandir}/man3/sd_bus_error_move.3.gz +%{_mandir}/man3/sd_bus_error_set.3.gz +%{_mandir}/man3/sd_bus_error_set_const.3.gz +%{_mandir}/man3/sd_bus_error_set_errno.3.gz +%{_mandir}/man3/sd_bus_error_set_errnof.3.gz +%{_mandir}/man3/sd_bus_error_set_errnofv.3.gz +%{_mandir}/man3/sd_bus_error_setf.3.gz +%{_mandir}/man3/sd_bus_flush.3.gz +%{_mandir}/man3/sd_bus_flush_close_unref.3.gz +%{_mandir}/man3/sd_bus_flush_close_unrefp.3.gz +%{_mandir}/man3/sd_bus_get_address.3.gz +%{_mandir}/man3/sd_bus_get_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_get_bus_id.3.gz +%{_mandir}/man3/sd_bus_get_close_on_exit.3.gz +%{_mandir}/man3/sd_bus_get_connected_signal.3.gz +%{_mandir}/man3/sd_bus_get_creds_mask.3.gz +%{_mandir}/man3/sd_bus_get_current_handler.3.gz +%{_mandir}/man3/sd_bus_get_current_message.3.gz +%{_mandir}/man3/sd_bus_get_current_slot.3.gz +%{_mandir}/man3/sd_bus_get_current_userdata.3.gz +%{_mandir}/man3/sd_bus_get_description.3.gz +%{_mandir}/man3/sd_bus_get_event.3.gz +%{_mandir}/man3/sd_bus_get_events.3.gz +%{_mandir}/man3/sd_bus_get_exit_on_disconnect.3.gz +%{_mandir}/man3/sd_bus_get_fd.3.gz +%{_mandir}/man3/sd_bus_get_method_call_timeout.3.gz +%{_mandir}/man3/sd_bus_get_n_queued_read.3.gz +%{_mandir}/man3/sd_bus_get_n_queued_write.3.gz +%{_mandir}/man3/sd_bus_get_name_creds.3.gz +%{_mandir}/man3/sd_bus_get_name_machine_id.3.gz +%{_mandir}/man3/sd_bus_get_owner_creds.3.gz +%{_mandir}/man3/sd_bus_get_property.3.gz +%{_mandir}/man3/sd_bus_get_property_string.3.gz +%{_mandir}/man3/sd_bus_get_property_strv.3.gz +%{_mandir}/man3/sd_bus_get_property_trivial.3.gz +%{_mandir}/man3/sd_bus_get_scope.3.gz +%{_mandir}/man3/sd_bus_get_sender.3.gz +%{_mandir}/man3/sd_bus_get_tid.3.gz +%{_mandir}/man3/sd_bus_get_timeout.3.gz +%{_mandir}/man3/sd_bus_get_unique_name.3.gz +%{_mandir}/man3/sd_bus_get_watch_bind.3.gz +%{_mandir}/man3/sd_bus_interface_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_is_anonymous.3.gz +%{_mandir}/man3/sd_bus_is_bus_client.3.gz +%{_mandir}/man3/sd_bus_is_monitor.3.gz +%{_mandir}/man3/sd_bus_is_open.3.gz +%{_mandir}/man3/sd_bus_is_ready.3.gz +%{_mandir}/man3/sd_bus_is_server.3.gz +%{_mandir}/man3/sd_bus_is_trusted.3.gz +%{_mandir}/man3/sd_bus_list_names.3.gz +%{_mandir}/man3/sd_bus_match_signal.3.gz +%{_mandir}/man3/sd_bus_match_signal_async.3.gz +%{_mandir}/man3/sd_bus_member_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_message_append.3.gz +%{_mandir}/man3/sd_bus_message_append_array.3.gz +%{_mandir}/man3/sd_bus_message_append_array_iovec.3.gz +%{_mandir}/man3/sd_bus_message_append_array_memfd.3.gz +%{_mandir}/man3/sd_bus_message_append_array_space.3.gz +%{_mandir}/man3/sd_bus_message_append_basic.3.gz +%{_mandir}/man3/sd_bus_message_append_string_iovec.3.gz +%{_mandir}/man3/sd_bus_message_append_string_memfd.3.gz +%{_mandir}/man3/sd_bus_message_append_string_space.3.gz +%{_mandir}/man3/sd_bus_message_append_strv.3.gz +%{_mandir}/man3/sd_bus_message_appendv.3.gz +%{_mandir}/man3/sd_bus_message_at_end.3.gz +%{_mandir}/man3/sd_bus_message_close_container.3.gz +%{_mandir}/man3/sd_bus_message_copy.3.gz +%{_mandir}/man3/sd_bus_message_dump.3.gz +%{_mandir}/man3/sd_bus_message_enter_container.3.gz +%{_mandir}/man3/sd_bus_message_exit_container.3.gz +%{_mandir}/man3/sd_bus_message_get_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_message_get_auto_start.3.gz +%{_mandir}/man3/sd_bus_message_get_bus.3.gz +%{_mandir}/man3/sd_bus_message_get_cookie.3.gz +%{_mandir}/man3/sd_bus_message_get_creds.3.gz +%{_mandir}/man3/sd_bus_message_get_destination.3.gz +%{_mandir}/man3/sd_bus_message_get_errno.3.gz +%{_mandir}/man3/sd_bus_message_get_error.3.gz +%{_mandir}/man3/sd_bus_message_get_expect_reply.3.gz +%{_mandir}/man3/sd_bus_message_get_interface.3.gz +%{_mandir}/man3/sd_bus_message_get_member.3.gz +%{_mandir}/man3/sd_bus_message_get_monotonic_usec.3.gz +%{_mandir}/man3/sd_bus_message_get_path.3.gz +%{_mandir}/man3/sd_bus_message_get_realtime_usec.3.gz +%{_mandir}/man3/sd_bus_message_get_reply_cookie.3.gz +%{_mandir}/man3/sd_bus_message_get_sender.3.gz +%{_mandir}/man3/sd_bus_message_get_seqnum.3.gz +%{_mandir}/man3/sd_bus_message_get_signature.3.gz +%{_mandir}/man3/sd_bus_message_get_type.3.gz +%{_mandir}/man3/sd_bus_message_has_signature.3.gz +%{_mandir}/man3/sd_bus_message_is_empty.3.gz +%{_mandir}/man3/sd_bus_message_is_method_call.3.gz +%{_mandir}/man3/sd_bus_message_is_method_error.3.gz +%{_mandir}/man3/sd_bus_message_is_signal.3.gz +%{_mandir}/man3/sd_bus_message_new.3.gz +%{_mandir}/man3/sd_bus_message_new_method_call.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errno.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errnof.3.gz +%{_mandir}/man3/sd_bus_message_new_method_error.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errorf.3.gz +%{_mandir}/man3/sd_bus_message_new_method_return.3.gz +%{_mandir}/man3/sd_bus_message_new_signal.3.gz +%{_mandir}/man3/sd_bus_message_open_container.3.gz +%{_mandir}/man3/sd_bus_message_peek_type.3.gz +%{_mandir}/man3/sd_bus_message_read.3.gz +%{_mandir}/man3/sd_bus_message_read_array.3.gz +%{_mandir}/man3/sd_bus_message_read_basic.3.gz +%{_mandir}/man3/sd_bus_message_read_strv.3.gz +%{_mandir}/man3/sd_bus_message_readv.3.gz +%{_mandir}/man3/sd_bus_message_ref.3.gz +%{_mandir}/man3/sd_bus_message_rewind.3.gz +%{_mandir}/man3/sd_bus_message_seal.3.gz +%{_mandir}/man3/sd_bus_message_send.3.gz +%{_mandir}/man3/sd_bus_message_sensitive.3.gz +%{_mandir}/man3/sd_bus_message_set_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_message_set_auto_start.3.gz +%{_mandir}/man3/sd_bus_message_set_destination.3.gz +%{_mandir}/man3/sd_bus_message_set_expect_reply.3.gz +%{_mandir}/man3/sd_bus_message_set_sender.3.gz +%{_mandir}/man3/sd_bus_message_skip.3.gz +%{_mandir}/man3/sd_bus_message_unref.3.gz +%{_mandir}/man3/sd_bus_message_unrefp.3.gz +%{_mandir}/man3/sd_bus_message_verify_type.3.gz +%{_mandir}/man3/sd_bus_negotiate_creds.3.gz +%{_mandir}/man3/sd_bus_negotiate_fds.3.gz +%{_mandir}/man3/sd_bus_negotiate_timestamp.3.gz +%{_mandir}/man3/sd_bus_new.3.gz +%{_mandir}/man3/sd_bus_object_path_is_valid.3.gz +%{_mandir}/man3/sd_bus_open.3.gz +%{_mandir}/man3/sd_bus_open_system.3.gz +%{_mandir}/man3/sd_bus_open_system_machine.3.gz +%{_mandir}/man3/sd_bus_open_system_remote.3.gz +%{_mandir}/man3/sd_bus_open_system_with_description.3.gz +%{_mandir}/man3/sd_bus_open_user.3.gz +%{_mandir}/man3/sd_bus_open_user_machine.3.gz +%{_mandir}/man3/sd_bus_open_user_with_description.3.gz +%{_mandir}/man3/sd_bus_open_with_description.3.gz +%{_mandir}/man3/sd_bus_path_decode.3.gz +%{_mandir}/man3/sd_bus_path_decode_many.3.gz +%{_mandir}/man3/sd_bus_path_encode.3.gz +%{_mandir}/man3/sd_bus_path_encode_many.3.gz +%{_mandir}/man3/sd_bus_process.3.gz +%{_mandir}/man3/sd_bus_query_sender_creds.3.gz +%{_mandir}/man3/sd_bus_query_sender_privilege.3.gz +%{_mandir}/man3/sd_bus_ref.3.gz +%{_mandir}/man3/sd_bus_release_name.3.gz +%{_mandir}/man3/sd_bus_release_name_async.3.gz +%{_mandir}/man3/sd_bus_reply_method_errno.3.gz +%{_mandir}/man3/sd_bus_reply_method_errnof.3.gz +%{_mandir}/man3/sd_bus_reply_method_errnofv.3.gz +%{_mandir}/man3/sd_bus_reply_method_error.3.gz +%{_mandir}/man3/sd_bus_reply_method_errorf.3.gz +%{_mandir}/man3/sd_bus_reply_method_errorfv.3.gz +%{_mandir}/man3/sd_bus_reply_method_return.3.gz +%{_mandir}/man3/sd_bus_reply_method_returnv.3.gz +%{_mandir}/man3/sd_bus_request_name.3.gz +%{_mandir}/man3/sd_bus_request_name_async.3.gz +%{_mandir}/man3/sd_bus_send.3.gz +%{_mandir}/man3/sd_bus_send_to.3.gz +%{_mandir}/man3/sd_bus_service_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_set_address.3.gz +%{_mandir}/man3/sd_bus_set_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_set_anonymous.3.gz +%{_mandir}/man3/sd_bus_set_bus_client.3.gz +%{_mandir}/man3/sd_bus_set_close_on_exit.3.gz +%{_mandir}/man3/sd_bus_set_connected_signal.3.gz +%{_mandir}/man3/sd_bus_set_description.3.gz +%{_mandir}/man3/sd_bus_set_exec.3.gz +%{_mandir}/man3/sd_bus_set_exit_on_disconnect.3.gz +%{_mandir}/man3/sd_bus_set_fd.3.gz +%{_mandir}/man3/sd_bus_set_method_call_timeout.3.gz +%{_mandir}/man3/sd_bus_set_monitor.3.gz +%{_mandir}/man3/sd_bus_set_property.3.gz +%{_mandir}/man3/sd_bus_set_propertyv.3.gz +%{_mandir}/man3/sd_bus_set_sender.3.gz +%{_mandir}/man3/sd_bus_set_server.3.gz +%{_mandir}/man3/sd_bus_set_trusted.3.gz +%{_mandir}/man3/sd_bus_set_watch_bind.3.gz +%{_mandir}/man3/sd_bus_slot_get_bus.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_handler.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_message.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_get_description.3.gz +%{_mandir}/man3/sd_bus_slot_get_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_slot_get_floating.3.gz +%{_mandir}/man3/sd_bus_slot_get_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_ref.3.gz +%{_mandir}/man3/sd_bus_slot_set_description.3.gz +%{_mandir}/man3/sd_bus_slot_set_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_slot_set_floating.3.gz +%{_mandir}/man3/sd_bus_slot_set_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_unref.3.gz +%{_mandir}/man3/sd_bus_slot_unrefp.3.gz +%{_mandir}/man3/sd_bus_start.3.gz +%{_mandir}/man3/sd_bus_track_add_name.3.gz +%{_mandir}/man3/sd_bus_track_add_sender.3.gz +%{_mandir}/man3/sd_bus_track_contains.3.gz +%{_mandir}/man3/sd_bus_track_count.3.gz +%{_mandir}/man3/sd_bus_track_count_name.3.gz +%{_mandir}/man3/sd_bus_track_count_sender.3.gz +%{_mandir}/man3/sd_bus_track_first.3.gz +%{_mandir}/man3/sd_bus_track_get_bus.3.gz +%{_mandir}/man3/sd_bus_track_get_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_track_get_recursive.3.gz +%{_mandir}/man3/sd_bus_track_get_userdata.3.gz +%{_mandir}/man3/sd_bus_track_new.3.gz +%{_mandir}/man3/sd_bus_track_next.3.gz +%{_mandir}/man3/sd_bus_track_ref.3.gz +%{_mandir}/man3/sd_bus_track_remove_name.3.gz +%{_mandir}/man3/sd_bus_track_remove_sender.3.gz +%{_mandir}/man3/sd_bus_track_set_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_track_set_recursive.3.gz +%{_mandir}/man3/sd_bus_track_set_userdata.3.gz +%{_mandir}/man3/sd_bus_track_unref.3.gz +%{_mandir}/man3/sd_bus_track_unrefp.3.gz +%{_mandir}/man3/sd_bus_unref.3.gz +%{_mandir}/man3/sd_bus_unrefp.3.gz +%{_mandir}/man3/sd_bus_wait.3.gz +%{_mandir}/man3/sd_event.3.gz +%{_mandir}/man3/sd_event_add_child.3.gz +%{_mandir}/man3/sd_event_add_child_pidfd.3.gz +%{_mandir}/man3/sd_event_add_defer.3.gz +%{_mandir}/man3/sd_event_add_exit.3.gz +%{_mandir}/man3/sd_event_add_inotify.3.gz +%{_mandir}/man3/sd_event_add_io.3.gz +%{_mandir}/man3/sd_event_add_post.3.gz +%{_mandir}/man3/sd_event_add_signal.3.gz +%{_mandir}/man3/sd_event_add_time.3.gz +%{_mandir}/man3/sd_event_add_time_relative.3.gz +%{_mandir}/man3/sd_event_child_handler_t.3.gz +%{_mandir}/man3/sd_event_default.3.gz +%{_mandir}/man3/sd_event_destroy_t.3.gz +%{_mandir}/man3/sd_event_dispatch.3.gz +%{_mandir}/man3/sd_event_exit.3.gz +%{_mandir}/man3/sd_event_get_exit_code.3.gz +%{_mandir}/man3/sd_event_get_fd.3.gz +%{_mandir}/man3/sd_event_get_iteration.3.gz +%{_mandir}/man3/sd_event_get_state.3.gz +%{_mandir}/man3/sd_event_get_tid.3.gz +%{_mandir}/man3/sd_event_get_watchdog.3.gz +%{_mandir}/man3/sd_event_handler_t.3.gz +%{_mandir}/man3/sd_event_inotify_handler_t.3.gz +%{_mandir}/man3/sd_event_io_handler_t.3.gz +%{_mandir}/man3/sd_event_loop.3.gz +%{_mandir}/man3/sd_event_new.3.gz +%{_mandir}/man3/sd_event_now.3.gz +%{_mandir}/man3/sd_event_prepare.3.gz +%{_mandir}/man3/sd_event_ref.3.gz +%{_mandir}/man3/sd_event_run.3.gz +%{_mandir}/man3/sd_event_set_watchdog.3.gz +%{_mandir}/man3/sd_event_signal_handler_t.3.gz +%{_mandir}/man3/sd_event_source.3.gz +%{_mandir}/man3/sd_event_source_disable_unref.3.gz +%{_mandir}/man3/sd_event_source_disable_unrefp.3.gz +%{_mandir}/man3/sd_event_source_get_child_pid.3.gz +%{_mandir}/man3/sd_event_source_get_child_pidfd.3.gz +%{_mandir}/man3/sd_event_source_get_child_pidfd_own.3.gz +%{_mandir}/man3/sd_event_source_get_child_process_own.3.gz +%{_mandir}/man3/sd_event_source_get_description.3.gz +%{_mandir}/man3/sd_event_source_get_destroy_callback.3.gz +%{_mandir}/man3/sd_event_source_get_enabled.3.gz +%{_mandir}/man3/sd_event_source_get_event.3.gz +%{_mandir}/man3/sd_event_source_get_exit_on_failure.3.gz +%{_mandir}/man3/sd_event_source_get_floating.3.gz +%{_mandir}/man3/sd_event_source_get_inotify_mask.3.gz +%{_mandir}/man3/sd_event_source_get_io_events.3.gz +%{_mandir}/man3/sd_event_source_get_io_fd.3.gz +%{_mandir}/man3/sd_event_source_get_io_fd_own.3.gz +%{_mandir}/man3/sd_event_source_get_io_revents.3.gz +%{_mandir}/man3/sd_event_source_get_pending.3.gz +%{_mandir}/man3/sd_event_source_get_priority.3.gz +%{_mandir}/man3/sd_event_source_get_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_get_signal.3.gz +%{_mandir}/man3/sd_event_source_get_time.3.gz +%{_mandir}/man3/sd_event_source_get_time_accuracy.3.gz +%{_mandir}/man3/sd_event_source_get_time_clock.3.gz +%{_mandir}/man3/sd_event_source_get_userdata.3.gz +%{_mandir}/man3/sd_event_source_is_ratelimited.3.gz +%{_mandir}/man3/sd_event_source_ref.3.gz +%{_mandir}/man3/sd_event_source_send_child_signal.3.gz +%{_mandir}/man3/sd_event_source_set_child_pidfd_own.3.gz +%{_mandir}/man3/sd_event_source_set_child_process_own.3.gz +%{_mandir}/man3/sd_event_source_set_description.3.gz +%{_mandir}/man3/sd_event_source_set_destroy_callback.3.gz +%{_mandir}/man3/sd_event_source_set_enabled.3.gz +%{_mandir}/man3/sd_event_source_set_exit_on_failure.3.gz +%{_mandir}/man3/sd_event_source_set_floating.3.gz +%{_mandir}/man3/sd_event_source_set_io_events.3.gz +%{_mandir}/man3/sd_event_source_set_io_fd.3.gz +%{_mandir}/man3/sd_event_source_set_io_fd_own.3.gz +%{_mandir}/man3/sd_event_source_set_prepare.3.gz +%{_mandir}/man3/sd_event_source_set_priority.3.gz +%{_mandir}/man3/sd_event_source_set_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_set_time.3.gz +%{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz +%{_mandir}/man3/sd_event_source_set_time_relative.3.gz +%{_mandir}/man3/sd_event_source_set_userdata.3.gz +%{_mandir}/man3/sd_event_source_unref.3.gz +%{_mandir}/man3/sd_event_source_unrefp.3.gz +%{_mandir}/man3/sd_event_time_handler_t.3.gz +%{_mandir}/man3/sd_event_unref.3.gz +%{_mandir}/man3/sd_event_unrefp.3.gz +%{_mandir}/man3/sd_event_wait.3.gz +%{_mandir}/man3/sd_get_machine_names.3.gz +%{_mandir}/man3/sd_get_seats.3.gz +%{_mandir}/man3/sd_get_sessions.3.gz +%{_mandir}/man3/sd_get_uids.3.gz +%{_mandir}/man3/sd_hwdb_enumerate.3.gz +%{_mandir}/man3/sd_hwdb_get.3.gz +%{_mandir}/man3/sd_hwdb_new.3.gz +%{_mandir}/man3/sd_hwdb_ref.3.gz +%{_mandir}/man3/sd_hwdb_seek.3.gz +%{_mandir}/man3/sd_hwdb_unref.3.gz +%{_mandir}/man3/sd_id128_equal.3.gz +%{_mandir}/man3/sd_id128_from_string.3.gz +%{_mandir}/man3/sd_id128_get_boot.3.gz +%{_mandir}/man3/sd_id128_get_boot_app_specific.3.gz +%{_mandir}/man3/sd_id128_get_invocation.3.gz +%{_mandir}/man3/sd_id128_get_machine.3.gz +%{_mandir}/man3/sd_id128_get_machine_app_specific.3.gz +%{_mandir}/man3/sd_id128_in_set.3.gz +%{_mandir}/man3/sd_id128_in_set_sentinel.3.gz +%{_mandir}/man3/sd_id128_in_setv.3.gz +%{_mandir}/man3/sd_id128_is_allf.3.gz +%{_mandir}/man3/sd_id128_is_null.3.gz +%{_mandir}/man3/sd_id128_randomize.3.gz +%{_mandir}/man3/sd_id128_t.3.gz +%{_mandir}/man3/sd_id128_to_string.3.gz +%{_mandir}/man3/sd_is_fifo.3.gz +%{_mandir}/man3/sd_is_mq.3.gz +%{_mandir}/man3/sd_is_socket.3.gz +%{_mandir}/man3/sd_is_socket_inet.3.gz +%{_mandir}/man3/sd_is_socket_sockaddr.3.gz +%{_mandir}/man3/sd_is_socket_unix.3.gz +%{_mandir}/man3/sd_is_special.3.gz +%{_mandir}/man3/sd_journal.3.gz +%{_mandir}/man3/sd_journal_add_conjunction.3.gz +%{_mandir}/man3/sd_journal_add_disjunction.3.gz +%{_mandir}/man3/sd_journal_add_match.3.gz +%{_mandir}/man3/sd_journal_close.3.gz +%{_mandir}/man3/sd_journal_enumerate_available_data.3.gz +%{_mandir}/man3/sd_journal_enumerate_available_unique.3.gz +%{_mandir}/man3/sd_journal_enumerate_data.3.gz +%{_mandir}/man3/sd_journal_enumerate_fields.3.gz +%{_mandir}/man3/sd_journal_enumerate_unique.3.gz +%{_mandir}/man3/sd_journal_flush_matches.3.gz +%{_mandir}/man3/sd_journal_get_catalog.3.gz +%{_mandir}/man3/sd_journal_get_catalog_for_message_id.3.gz +%{_mandir}/man3/sd_journal_get_cursor.3.gz +%{_mandir}/man3/sd_journal_get_cutoff_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_get_cutoff_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_get_data.3.gz +%{_mandir}/man3/sd_journal_get_data_threshold.3.gz +%{_mandir}/man3/sd_journal_get_events.3.gz +%{_mandir}/man3/sd_journal_get_fd.3.gz +%{_mandir}/man3/sd_journal_get_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_get_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_get_timeout.3.gz +%{_mandir}/man3/sd_journal_get_usage.3.gz +%{_mandir}/man3/sd_journal_has_persistent_files.3.gz +%{_mandir}/man3/sd_journal_has_runtime_files.3.gz +%{_mandir}/man3/sd_journal_next.3.gz +%{_mandir}/man3/sd_journal_next_skip.3.gz +%{_mandir}/man3/sd_journal_open.3.gz +%{_mandir}/man3/sd_journal_open_directory.3.gz +%{_mandir}/man3/sd_journal_open_directory_fd.3.gz +%{_mandir}/man3/sd_journal_open_files.3.gz +%{_mandir}/man3/sd_journal_open_files_fd.3.gz +%{_mandir}/man3/sd_journal_open_namespace.3.gz +%{_mandir}/man3/sd_journal_perror.3.gz +%{_mandir}/man3/sd_journal_perror_with_location.3.gz +%{_mandir}/man3/sd_journal_previous.3.gz +%{_mandir}/man3/sd_journal_previous_skip.3.gz +%{_mandir}/man3/sd_journal_print.3.gz +%{_mandir}/man3/sd_journal_print_with_location.3.gz +%{_mandir}/man3/sd_journal_printv.3.gz +%{_mandir}/man3/sd_journal_printv_with_location.3.gz +%{_mandir}/man3/sd_journal_process.3.gz +%{_mandir}/man3/sd_journal_query_unique.3.gz +%{_mandir}/man3/sd_journal_reliable_fd.3.gz +%{_mandir}/man3/sd_journal_restart_data.3.gz +%{_mandir}/man3/sd_journal_restart_fields.3.gz +%{_mandir}/man3/sd_journal_restart_unique.3.gz +%{_mandir}/man3/sd_journal_seek_cursor.3.gz +%{_mandir}/man3/sd_journal_seek_head.3.gz +%{_mandir}/man3/sd_journal_seek_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_seek_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_seek_tail.3.gz +%{_mandir}/man3/sd_journal_send.3.gz +%{_mandir}/man3/sd_journal_send_with_location.3.gz +%{_mandir}/man3/sd_journal_sendv.3.gz +%{_mandir}/man3/sd_journal_sendv_with_location.3.gz +%{_mandir}/man3/sd_journal_set_data_threshold.3.gz +%{_mandir}/man3/sd_journal_stream_fd.3.gz +%{_mandir}/man3/sd_journal_test_cursor.3.gz +%{_mandir}/man3/sd_journal_wait.3.gz +%{_mandir}/man3/sd_listen_fds.3.gz +%{_mandir}/man3/sd_listen_fds_with_names.3.gz +%{_mandir}/man3/sd_login_monitor.3.gz +%{_mandir}/man3/sd_login_monitor_flush.3.gz +%{_mandir}/man3/sd_login_monitor_get_events.3.gz +%{_mandir}/man3/sd_login_monitor_get_fd.3.gz +%{_mandir}/man3/sd_login_monitor_get_timeout.3.gz +%{_mandir}/man3/sd_login_monitor_new.3.gz +%{_mandir}/man3/sd_login_monitor_unref.3.gz +%{_mandir}/man3/sd_login_monitor_unrefp.3.gz +%{_mandir}/man3/sd_machine_get_class.3.gz +%{_mandir}/man3/sd_machine_get_ifindices.3.gz +%{_mandir}/man3/sd_notify.3.gz +%{_mandir}/man3/sd_notify_barrier.3.gz +%{_mandir}/man3/sd_notifyf.3.gz +%{_mandir}/man3/sd_path_lookup.3.gz +%{_mandir}/man3/sd_path_lookup_strv.3.gz +%{_mandir}/man3/sd_peer_get_cgroup.3.gz +%{_mandir}/man3/sd_peer_get_machine_name.3.gz +%{_mandir}/man3/sd_peer_get_owner_uid.3.gz +%{_mandir}/man3/sd_peer_get_session.3.gz +%{_mandir}/man3/sd_peer_get_slice.3.gz +%{_mandir}/man3/sd_peer_get_unit.3.gz +%{_mandir}/man3/sd_peer_get_user_slice.3.gz +%{_mandir}/man3/sd_peer_get_user_unit.3.gz +%{_mandir}/man3/sd_pid_get_cgroup.3.gz +%{_mandir}/man3/sd_pid_get_machine_name.3.gz +%{_mandir}/man3/sd_pid_get_owner_uid.3.gz +%{_mandir}/man3/sd_pid_get_session.3.gz +%{_mandir}/man3/sd_pid_get_slice.3.gz +%{_mandir}/man3/sd_pid_get_unit.3.gz +%{_mandir}/man3/sd_pid_get_user_slice.3.gz +%{_mandir}/man3/sd_pid_get_user_unit.3.gz +%{_mandir}/man3/sd_pid_notify.3.gz +%{_mandir}/man3/sd_pid_notify_with_fds.3.gz +%{_mandir}/man3/sd_pid_notifyf.3.gz +%{_mandir}/man3/sd_seat_can_graphical.3.gz +%{_mandir}/man3/sd_seat_can_tty.3.gz +%{_mandir}/man3/sd_seat_get_active.3.gz +%{_mandir}/man3/sd_seat_get_sessions.3.gz +%{_mandir}/man3/sd_session_get_class.3.gz +%{_mandir}/man3/sd_session_get_desktop.3.gz +%{_mandir}/man3/sd_session_get_display.3.gz +%{_mandir}/man3/sd_session_get_remote_host.3.gz +%{_mandir}/man3/sd_session_get_remote_user.3.gz +%{_mandir}/man3/sd_session_get_seat.3.gz +%{_mandir}/man3/sd_session_get_service.3.gz +%{_mandir}/man3/sd_session_get_state.3.gz +%{_mandir}/man3/sd_session_get_tty.3.gz +%{_mandir}/man3/sd_session_get_type.3.gz +%{_mandir}/man3/sd_session_get_uid.3.gz +%{_mandir}/man3/sd_session_get_vt.3.gz +%{_mandir}/man3/sd_session_is_active.3.gz +%{_mandir}/man3/sd_session_is_remote.3.gz +%{_mandir}/man3/sd_uid_get_display.3.gz +%{_mandir}/man3/sd_uid_get_seats.3.gz +%{_mandir}/man3/sd_uid_get_sessions.3.gz +%{_mandir}/man3/sd_uid_get_state.3.gz +%{_mandir}/man3/sd_uid_is_on_seat.3.gz +%{_mandir}/man3/sd_watchdog_enabled.3.gz +%{_mandir}/man3/udev_device_get_action.3.gz +%{_mandir}/man3/udev_device_get_current_tags_list_entry.3.gz +%{_mandir}/man3/udev_device_get_devlinks_list_entry.3.gz +%{_mandir}/man3/udev_device_get_devnode.3.gz +%{_mandir}/man3/udev_device_get_devnum.3.gz +%{_mandir}/man3/udev_device_get_devpath.3.gz +%{_mandir}/man3/udev_device_get_devtype.3.gz +%{_mandir}/man3/udev_device_get_driver.3.gz +%{_mandir}/man3/udev_device_get_is_initialized.3.gz +%{_mandir}/man3/udev_device_get_parent.3.gz +%{_mandir}/man3/udev_device_get_parent_with_subsystem_devtype.3.gz +%{_mandir}/man3/udev_device_get_properties_list_entry.3.gz +%{_mandir}/man3/udev_device_get_property_value.3.gz +%{_mandir}/man3/udev_device_get_subsystem.3.gz +%{_mandir}/man3/udev_device_get_sysattr_list_entry.3.gz +%{_mandir}/man3/udev_device_get_sysattr_value.3.gz +%{_mandir}/man3/udev_device_get_sysname.3.gz +%{_mandir}/man3/udev_device_get_sysnum.3.gz +%{_mandir}/man3/udev_device_get_syspath.3.gz +%{_mandir}/man3/udev_device_get_tags_list_entry.3.gz +%{_mandir}/man3/udev_device_get_udev.3.gz +%{_mandir}/man3/udev_device_has_current_tag.3.gz +%{_mandir}/man3/udev_device_has_tag.3.gz +%{_mandir}/man3/udev_device_new_from_device_id.3.gz +%{_mandir}/man3/udev_device_new_from_devnum.3.gz +%{_mandir}/man3/udev_device_new_from_environment.3.gz +%{_mandir}/man3/udev_device_new_from_subsystem_sysname.3.gz +%{_mandir}/man3/udev_device_new_from_syspath.3.gz +%{_mandir}/man3/udev_device_ref.3.gz +%{_mandir}/man3/udev_device_set_sysattr_value.3.gz +%{_mandir}/man3/udev_device_unref.3.gz +%{_mandir}/man3/udev_enumerate_add_match_is_initialized.3.gz +%{_mandir}/man3/udev_enumerate_add_match_parent.3.gz +%{_mandir}/man3/udev_enumerate_add_match_property.3.gz +%{_mandir}/man3/udev_enumerate_add_match_subsystem.3.gz +%{_mandir}/man3/udev_enumerate_add_match_sysattr.3.gz +%{_mandir}/man3/udev_enumerate_add_match_sysname.3.gz +%{_mandir}/man3/udev_enumerate_add_match_tag.3.gz +%{_mandir}/man3/udev_enumerate_add_nomatch_subsystem.3.gz +%{_mandir}/man3/udev_enumerate_add_nomatch_sysattr.3.gz +%{_mandir}/man3/udev_enumerate_add_syspath.3.gz +%{_mandir}/man3/udev_enumerate_get_list_entry.3.gz +%{_mandir}/man3/udev_enumerate_get_udev.3.gz +%{_mandir}/man3/udev_enumerate_new.3.gz +%{_mandir}/man3/udev_enumerate_ref.3.gz +%{_mandir}/man3/udev_enumerate_scan_devices.3.gz +%{_mandir}/man3/udev_enumerate_scan_subsystems.3.gz +%{_mandir}/man3/udev_enumerate_unref.3.gz +%{_mandir}/man3/udev_list_entry.3.gz +%{_mandir}/man3/udev_list_entry_get_by_name.3.gz +%{_mandir}/man3/udev_list_entry_get_name.3.gz +%{_mandir}/man3/udev_list_entry_get_next.3.gz +%{_mandir}/man3/udev_list_entry_get_value.3.gz +%{_mandir}/man3/udev_monitor_enable_receiving.3.gz +%{_mandir}/man3/udev_monitor_filter_add_match_subsystem_devtype.3.gz +%{_mandir}/man3/udev_monitor_filter_add_match_tag.3.gz +%{_mandir}/man3/udev_monitor_filter_remove.3.gz +%{_mandir}/man3/udev_monitor_filter_update.3.gz +%{_mandir}/man3/udev_monitor_get_fd.3.gz +%{_mandir}/man3/udev_monitor_get_udev.3.gz +%{_mandir}/man3/udev_monitor_new_from_netlink.3.gz +%{_mandir}/man3/udev_monitor_receive_device.3.gz +%{_mandir}/man3/udev_monitor_ref.3.gz +%{_mandir}/man3/udev_monitor_set_receive_buffer_size.3.gz +%{_mandir}/man3/udev_monitor_unref.3.gz +%{_mandir}/man3/udev_new.3.gz +%{_mandir}/man3/udev_ref.3.gz +%{_mandir}/man3/udev_unref.3.gz +%endif From 6cfe6f23766723d0d5948659c5ad6789d3c32fedcc6a14283b1373409915352a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 10:16:32 +0000 Subject: [PATCH 10/19] - Merge nss-resolved and nss-mymachines NSS plug-in modules into systemd-network and systemd-container respectively. These modules are plug-in modules hence the shared library packaging policy doesn't apply for them. Moreover they're pretty useless alone without their respective systemd services, Hence let's reduce the number of sub-packages as the list keeps increasing. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1238 --- baselibs.conf | 1 - files.container | 3 ++ files.network | 3 ++ systemd.changes | 11 +++++ systemd.spec | 105 +++++++++++++++++------------------------------- 5 files changed, 54 insertions(+), 69 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 04045353..4e056067 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -9,4 +9,3 @@ systemd libsystemd0 libudev1 nss-myhostname -nss-mymachines diff --git a/files.container b/files.container index 3f2baa79..f7b3d670 100644 --- a/files.container +++ b/files.container @@ -6,8 +6,11 @@ %if ! 0%{?bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn +%{_libdir}/libnss_mymachines.so.2 %{_mandir}/man1/systemd-nspawn.1.gz %{_mandir}/man5/systemd.nspawn.5.gz +%{_mandir}/man8/libnss_mymachines.so.2.8.gz +%{_mandir}/man8/nss-mymachines.8.gz %endif %{_unitdir}/systemd-nspawn@.service diff --git a/files.network b/files.network index fa5a0bde..1a2f71d9 100644 --- a/files.network +++ b/files.network @@ -44,10 +44,13 @@ %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_datadir}/zsh/site-functions/_resolvectl +%{_libdir}/libnss_resolve.so.2 %{_mandir}/man1/resolvectl.1.gz %{_mandir}/man5/org.freedesktop.resolve1.5.gz %{_mandir}/man5/resolved.conf.5.gz %{_mandir}/man5/resolved.conf.d.5.gz +%{_mandir}/man8/libnss_resolve.so.2.8.gz +%{_mandir}/man8/nss-resolve.8.gz %{_mandir}/man8/systemd-resolved.8.gz %{_mandir}/man8/systemd-resolved.service.8.gz %{_systemd_util_dir}/resolv.conf diff --git a/systemd.changes b/systemd.changes index deb1a238..20b5991f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jan 28 16:04:36 UTC 2022 - Franck Bui + +- Merge nss-resolved and nss-mymachines NSS plug-in modules into systemd-network + and systemd-container respectively. + + These modules are plug-in modules hence the shared library packaging policy + doesn't apply for them. Moreover they're pretty useless alone without their + respective systemd services, Hence let's reduce the number of sub-packages as + the list keeps increasing. + ------------------------------------------------------------------- Thu Jan 27 10:50:50 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3f5c461e..a3d21fff 100644 --- a/systemd.spec +++ b/systemd.spec @@ -251,8 +251,8 @@ Conflicts: libudev-devel %endif %description devel -Development headers and files for libsystemd and libudev libraries. These files -are useful for developing applications linking to these libraries. +Development headers and files for libsystemd and libudev libraries for +developing and building applications linking to these libraries. %package sysvinit Summary: System V init tools @@ -301,6 +301,7 @@ License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: %{name} = %{version}-%{release} %systemd_requires +Requires: filesystem Requires: kmod Requires: system-group-hardware Requires: group(kvm) @@ -313,10 +314,8 @@ Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 -Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version}-%{release} -Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap Requires: this-is-only-for-build-envs @@ -362,20 +361,29 @@ Summary: Systemd tools for container management License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires +Obsoletes: nss-mymachines < %{version}-%{release} +Provides: nss-mymachines = %{version}-%{release} +Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} Conflicts: systemd-container +Provides: systemd-container = %{version}-%{release} %endif %description container Systemd tools to spawn and manage containers and virtual machines. -This package contains systemd-nspawn, machinectl, systemd-machined, -and systemd-importd. +In addition, it also contains a plugin for the Name Service Switch (NSS), +providing host name resolution for all local containers and virtual machines +using network namespacing and registered with systemd-machined. It also maps +UID/GIDs ranges used by containers to useful names. + +To activate this NSS module, you will need to include it in /etc/nsswitch.conf, +see nss-mymachines(8) manpage for more details. %if %{with networkd} || %{with resolved} %package network -Summary: Systemd tools for networkd and resolved +Summary: sytemd network manager and Network Name Resolution manager License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires @@ -383,13 +391,31 @@ Requires: %{name} = %{version}-%{release} Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) BuildRequires: pkgconfig(openssl) +Obsoletes: nss-resolve < %{version}-%{release} +Provides: nss-resolve = %{version}-%{release} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %description network -Systemd tools to manage network settings using networkd and -resolver tools for resolved +systemd-networkd is a system service that manages networks. It detects and +configures network devices as they appear, as well as manages network addresses +and routes for any link for which it finds a .network file, see +systemd.network(5). It can also create virtual network devices based on their +description given by systemd.netdev(5) files. It may be controlle by +networkctl(1). +systemd-resolved is a system service that provides network name resolution to +local applications. It implements a caching and validating DNS/DNSSEC stub +resolver, as well as an LLMNR and MulticastDNS resolver and responder. It may be +controlled by resolvectl(1). + +Addtionally, this package also contains a plug-in module for the Name Service +Switch (NSS), which enables hostname resolutions by contacting +systemd-resolved(8). It replaces the nss-dns plug-in module that traditionally +resolves hostnames via DNS. + +To activate this NSS module, you will need to include it in /etc/nsswitch.conf, +see nss-resolve(8) manpage for more details. %endif %if %{with portabled} @@ -438,38 +464,6 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif -%if %{with resolved} -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1-or-later -Requires: %{name}-network = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. -%endif - -%if %{with machined} -%package -n nss-mymachines -Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later - -%description -n nss-mymachines -This package contains a plugin for the Name Service Switch (NSS), -providing host name resolution for all local containers and virtual -machines registered with systemd-machined to their respective IP -addresses. It also maps UID/GIDs ranges used by containers to useful -names. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-mymachines(8) manpage for more details. -%endif - %if %{with journal_remote} %package journal-remote Summary: Gateway for serving journal events over the network using HTTP @@ -617,7 +611,6 @@ Have fun with these services at your own risk. %autosetup -p1 -n systemd-v%{version}%{suse_version} %build -# keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ @@ -1143,16 +1136,6 @@ fi %postun -n nss-systemd -p /sbin/ldconfig %endif -%if %{with resolved} -%post -n nss-resolve -p /sbin/ldconfig -%postun -n nss-resolve -p /sbin/ldconfig -%endif - -%if %{with machined} -%post -n nss-mymachines -p /sbin/ldconfig -%postun -n nss-mymachines -p /sbin/ldconfig -%endif - %if %{with journal_remote} %pre journal-remote %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service @@ -1193,6 +1176,7 @@ fi %service_add_post systemd-networkd-wait-online.service %endif %if %{with resolved} +%ldconfig %service_add_post systemd-resolved.service %endif @@ -1211,6 +1195,7 @@ fi %service_del_postun systemd-networkd-wait-online.service %endif %if %{with resolved} +%ldconfig %service_del_postun systemd-resolved.service %endif %endif @@ -1357,22 +1342,6 @@ fi %{_mandir}/man8/nss-systemd.* %endif -%if %{with resolved} -%files -n nss-resolve -%defattr(-, root, root) -%{_libdir}/libnss_resolve.so.2 -%{_mandir}/man8/libnss_resolve.* -%{_mandir}/man8/nss-resolve.* -%endif - -%if %{with machined} -%files -n nss-mymachines -%defattr(-,root,root) -%{_libdir}/libnss_mymachines.so* -%{_mandir}/man8/libnss_mymachines.* -%{_mandir}/man8/nss-mymachines.* -%endif - %if %{with journal_remote} %files journal-remote %defattr(-, root, root) From 3868d6b01df970298f0bf502ab51d65287ccbb03471a395d0dcfb0ce70a04c22 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 10:21:19 +0000 Subject: [PATCH 11/19] - Make use of %ldconfig_scriptlets OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1239 --- systemd.changes | 5 +++++ systemd.spec | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/systemd.changes b/systemd.changes index 20b5991f..0e5f1fc0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 31 10:19:23 UTC 2022 - Franck Bui + +- Make use of %ldconfig_scriptlets + ------------------------------------------------------------------- Fri Jan 28 16:04:36 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a3d21fff..fb010f83 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1129,11 +1129,8 @@ fi %endif %if ! 0%{?bootstrap} -%post -n nss-myhostname -p /sbin/ldconfig -%postun -n nss-myhostname -p /sbin/ldconfig - -%post -n nss-systemd -p /sbin/ldconfig -%postun -n nss-systemd -p /sbin/ldconfig +%ldconfig_scriptlets -n nss-myhostname +%ldconfig_scriptlets -n nss-systemd %endif %if %{with journal_remote} From 2b4112e1f97819707816ad98901838f0cde6507fde103e130c1bab15ff6ae730 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 14:13:33 +0000 Subject: [PATCH 12/19] - Import commit 885e0b9126bd2cf1e3f6b147c45ec58a5550c75c 41334be59e meson: minor cleanup 3db0c28462 sysusers: split up systemd.conf - Drop 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (bsc#1195153) Since v241, the patch isn't useful anymore because resolved is no more able to create /etc/resolv.conf symlink by itself,it runs as 'systemd-resolve' user. The symlink is now handled by a tmpfiles config file which is only installed when systemd-resolved is. The tmpfiles config file has currently a lower priority than the one shipped by netconfig. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1240 --- ...e-etc-resolv.conf-symlink-at-runtime.patch | 53 ------------------- files.network | 3 ++ files.systemd | 3 +- systemd-v249.9+suse.75.g3743acbce3.tar.xz | 3 -- systemd-v249.9+suse.79.g885e0b9126.tar.xz | 3 ++ systemd.changes | 16 ++++++ systemd.spec | 6 +-- 7 files changed, 27 insertions(+), 60 deletions(-) delete mode 100644 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch delete mode 100644 systemd-v249.9+suse.75.g3743acbce3.tar.xz create mode 100644 systemd-v249.9+suse.79.g885e0b9126.tar.xz diff --git a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch deleted file mode 100644 index 510c4732..00000000 --- a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1aa6cfc7ff05929f013262c86ab7557e5394fb4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 11/11] resolved: create /etc/resolv.conf symlink at runtime - -If the symlink doesn't exists, and we are being started, let's -create it to provie name resolution. - -If it exists, do nothing. In particular, if it is a broken symlink, -we cannot really know if the administator configured it to point to -a location used by some service that hasn't started yet, so we -don't touch it in that case either. - -https://bugzilla.redhat.com/show_bug.cgi?id=1313085 ---- - src/resolve/resolved.c | 6 ++++++ - tmpfiles.d/etc.conf.in | 3 --- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index aabaa266e9..39277ea487 100644 ---- a/src/resolve/resolved.c -+++ b/src/resolve/resolved.c -@@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) { - if (r < 0) - return log_error_errno(r, "Cannot resolve user name %s: %m", user); - -+ /* As we're root, we can create /etc/resolv.conf symlink if it doesn't exist already */ -+ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); -+ if (r < 0 && errno != EEXIST) -+ log_warning_errno(errno, -+ "Could not create /etc/resolv.conf symlink: %m"); -+ - /* As we're root, we can create the directory where resolv.conf will live */ - r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE); - if (r < 0) -diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in -index 2323fd8cd8..ebdc699c26 100644 ---- a/tmpfiles.d/etc.conf.in -+++ b/tmpfiles.d/etc.conf.in -@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - {% if HAVE_SMACK_RUN_LABEL %} - t /etc/mtab - - - - security.SMACK64=_ - {% endif %} --{% if ENABLE_RESOLVE %} --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --{% endif %} - C! /etc/nsswitch.conf - - - - - {% if HAVE_PAM %} - C! /etc/pam.d - - - - --- -2.26.2 - diff --git a/files.network b/files.network index 1a2f71d9..e6aa5e60 100644 --- a/files.network +++ b/files.network @@ -29,6 +29,7 @@ %{_systemd_util_dir}/network/80-wifi-station.network.example %{_systemd_util_dir}/systemd-networkd %{_systemd_util_dir}/systemd-networkd-wait-online +%{_sysusersdir}/systemd-network.conf %{_unitdir}/systemd-networkd-wait-online.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket @@ -55,5 +56,7 @@ %{_mandir}/man8/systemd-resolved.service.8.gz %{_systemd_util_dir}/resolv.conf %{_systemd_util_dir}/systemd-resolved +%{_sysusersdir}/systemd-resolve.conf +%{_tmpfilesdir}/systemd-resolve.conf %{_unitdir}/systemd-resolved.service %endif diff --git a/files.systemd b/files.systemd index 392d5f79..c9fd3a36 100644 --- a/files.systemd +++ b/files.systemd @@ -830,7 +830,8 @@ %if ! 0%{?bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif -%{_sysusersdir}/systemd.conf +%{_sysusersdir}/systemd-journal.conf +%{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/suse.conf %{_tmpfilesdir}/systemd-nologin.conf diff --git a/systemd-v249.9+suse.75.g3743acbce3.tar.xz b/systemd-v249.9+suse.75.g3743acbce3.tar.xz deleted file mode 100644 index 0adfea70..00000000 --- a/systemd-v249.9+suse.75.g3743acbce3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64320468ebe2502773e1365b50c369de2520ec4b614c623a4ca1339e26968ec2 -size 7278924 diff --git a/systemd-v249.9+suse.79.g885e0b9126.tar.xz b/systemd-v249.9+suse.79.g885e0b9126.tar.xz new file mode 100644 index 00000000..6d53a8ef --- /dev/null +++ b/systemd-v249.9+suse.79.g885e0b9126.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51c9904085a4c76526e49baf1e103afc39880d72247c971f91730d9cdebe9d99 +size 7279976 diff --git a/systemd.changes b/systemd.changes index 0e5f1fc0..7e42902c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jan 31 11:37:23 UTC 2022 - Franck Bui + +- Import commit 885e0b9126bd2cf1e3f6b147c45ec58a5550c75c + + 41334be59e meson: minor cleanup + 3db0c28462 sysusers: split up systemd.conf + +- Drop 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (bsc#1195153) + + Since v241, the patch isn't useful anymore because resolved is no more able to + create /etc/resolv.conf symlink by itself,it runs as 'systemd-resolve' + user. The symlink is now handled by a tmpfiles config file which is only + installed when systemd-resolved is. The tmpfiles config file has currently a + lower priority than the one shipped by netconfig. + ------------------------------------------------------------------- Mon Jan 31 10:19:23 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index fb010f83..00616452 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.75.g3743acbce3 +%define suse_version +suse.79.g885e0b9126 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -207,8 +207,7 @@ Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch Patch9: 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch -Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch -Patch13: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git @@ -1314,6 +1313,7 @@ fi %{_unitdir}/systemd-coredump* %{_unitdir}/sockets.target.wants/systemd-coredump.socket %{_sysctldir}/50-coredump.conf +%{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump %if ! 0%{?bootstrap} From 71481ef6cf3ea343eeb500de3dc39624e98249adc8d919909e85156bf054c60e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 15:05:15 +0000 Subject: [PATCH 13/19] - Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Given the fact that Factory no more ship SysV init scripts since several months, only scripts coming from 3rd party applications should remain which are unlikely to rely on the SUSE specifities implemented by these patches. This change was announced on the Factory mailing list: https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1241 --- ...dd-back-support-for-SysV-scripts-for.patch | 123 ------------------ ...pport-for-all-virtual-facility-and-f.patch | 43 ------ systemd.changes | 12 ++ systemd.spec | 2 - 4 files changed, 12 insertions(+), 168 deletions(-) delete mode 100644 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch delete mode 100644 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch deleted file mode 100644 index 11737094..00000000 --- a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1bd48f23ea7750b354bfb94482f9f035bf8b7841 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 06/11] sysv-generator: add (back) support for SysV scripts for - the early boot - -For the record, the upstream support was removed by commit -3cdebc217c42c8529086f2965319b6a48eaaeabe. - -The sysv-generator has some weirdos: for example a service at the rc0 -runlevel won't be started during shutdown since it will get both -"WantedBy=poweroff.target" and "Conflicts=shutdown.target". - -Anyways what's the current patch implements the following: - - - a symlink /etc/init.d/boot.d/S??boot.foo will add - "WantedBy/Before=sysinit.target" constraints and make sure that the - default dependencies added by systemd are turned off. - - - a symlink /etc/init.d/boot.d/K??boot.foo will add - "Conflicts/Before=shutdown.target" so "foo" service will be stopped - like any other regular services. If this symlink is not installed - however, "foo" will be stopped lately during the systemd killing - spree. - -This is a forward-port of commit 29db8537e1ca10796797d9854d1 in SP1. - -[Since v232] - -Support for S* symlinks in runlevel 0 or 6 has been completely and silently -removed by 788d2b088b13a2444b9eb2ea82c0cc57d9f0980f. Since it was already -broken as pointed out above, this probably wasn't really used and therefore -no one will really care. So let's drop it too. - -However this has the side effect to make the support of early sysv scripts more -difficult. To make things easy, the support of K* symlinks in boot.d/ has been -removed too: this is probably not used (anymore) (at least intentionally). - -The consequence is that early sysv services are stopped during shutdown at -the same time as 'normal' services. ---- - src/sysv-generator/sysv-generator.c | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index bf23c48662..fa5355c964 100644 ---- a/src/sysv-generator/sysv-generator.c -+++ b/src/sysv-generator/sysv-generator.c -@@ -31,6 +31,9 @@ static const struct { - const char *path; - const char *target; - } rcnd_table[] = { -+ /* SUSE style boot.d */ -+ { "boot.d", SPECIAL_SYSINIT_TARGET }, -+ - /* Standard SysV runlevels for start-up */ - { "rc1.d", SPECIAL_RESCUE_TARGET }, - { "rc2.d", SPECIAL_MULTI_USER_TARGET }, -@@ -57,6 +60,7 @@ typedef struct SysvStub { - bool has_lsb; - bool reload; - bool loaded; -+ bool early; - } SysvStub; - - static SysvStub* free_sysvstub(SysvStub *s) { -@@ -146,6 +150,12 @@ static int generate_unit_file(SysvStub *s) { - fprintf(f, "Description=%s\n", t); - } - -+ if (s->early) { -+ fprintf(f, "DefaultDependencies=no\n"); -+ fprintf(f, "Conflicts=%s\n", SPECIAL_SHUTDOWN_TARGET); -+ fprintf(f, "Before=%s\n", SPECIAL_SHUTDOWN_TARGET); -+ } -+ - STRV_FOREACH(p, s->before) - fprintf(f, "Before=%s\n", *p); - STRV_FOREACH(p, s->after) -@@ -212,6 +222,10 @@ static char *sysv_translate_name(const char *name) { - _cleanup_free_ char *c = NULL; - char *res; - -+ if (startswith(name, "boot.")) -+ /* Drop SuSE-style boot. prefix */ -+ name += 5; -+ - c = strdup(name); - if (!c) - return NULL; -@@ -288,6 +302,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - return 1; - } - -+ /* Strip "boot." prefix from file name for comparison (Suse specific) */ -+ e = startswith(filename, "boot."); -+ if (e) -+ filename += 5; -+ - /* Strip ".sh" suffix from file name for comparison */ - filename_no_sh = strdupa(filename); - e = endswith(filename_no_sh, ".sh"); -@@ -651,6 +670,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { - if (other->sysv_start_priority < 0) - continue; - -+ if (s->early != other->early) -+ continue; -+ - /* If both units have modern headers we don't care - * about the priorities */ - if (s->has_lsb && other->has_lsb) -@@ -775,6 +797,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { - .sysv_start_priority = -1, - .name = TAKE_PTR(name), - .path = TAKE_PTR(fpath), -+ .early = !!startswith(de->d_name, "boot."), - }; - - r = hashmap_put(all_services, service->name, service); --- -2.26.2 - diff --git a/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch b/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch deleted file mode 100644 index 91cc4e55..00000000 --- a/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6f4d9d9688ad65bb46d09ac09f570c6ee4bc3671 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Fri, 14 Jan 2022 08:17:38 +0100 -Subject: [PATCH 1010/1010] sysv: add back support for '$all' virtual facility - and '+' facitity name prefix - -'$all' was probably a Debian thing and has probably never been supported by RH, -which explains why systemd upstream never supported it too. At least I couldn't -find any reference of this facility name in -http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic.html#FACILNAME. OTOH -'$all' is described in https://wiki.debian.org/LSBInitScripts - -Regarding the '+' prefix, I couldn't find any mention of it -anywhere. Apparently it was equivalent to '$' in facility names. - -[wfink: bsc#858864] ---- - src/sysv-generator/sysv-generator.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index c6e1953839..0aadb397ed 100644 ---- a/src/sysv-generator/sysv-generator.c -+++ b/src/sysv-generator/sysv-generator.c -@@ -243,6 +243,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - "remote_fs", SPECIAL_REMOTE_FS_TARGET, - "syslog", NULL, - "time", SPECIAL_TIME_SYNC_TARGET, -+ "all", SPECIAL_DEFAULT_TARGET, - }; - - const char *filename; -@@ -257,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - - filename = basename(s->path); - -+ n = *name == '+' ? ++name : name; - n = *name == '$' ? name + 1 : name; - - for (i = 0; i < ELEMENTSOF(table); i += 2) { --- -2.31.1 - diff --git a/systemd.changes b/systemd.changes index 7e42902c..384769f5 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jan 31 14:54:07 UTC 2022 - Franck Bui + +- Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch + + Given the fact that Factory no more ship SysV init scripts since several + months, only scripts coming from 3rd party applications should remain which + are unlikely to rely on the SUSE specifities implemented by these + patches. This change was announced on the Factory mailing list: + + https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ + ------------------------------------------------------------------- Mon Jan 31 11:37:23 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 00616452..f6007a22 100644 --- a/systemd.spec +++ b/systemd.spec @@ -201,10 +201,8 @@ Patch1: 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch Patch2: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch Patch3: 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch -Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -Patch9: 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch From dc2bffc70d1903ed3cf59c099fc3cbde01901560ef07bcdf5b8d9d64ce7bfbf1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 31 Jan 2022 15:56:09 +0000 Subject: [PATCH 14/19] - Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1242 --- systemd-v249.9+suse.79.g885e0b9126.tar.xz | 3 --- systemd-v249.9+suse.82.g117bd7f14a.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 10 +++++----- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 systemd-v249.9+suse.79.g885e0b9126.tar.xz create mode 100644 systemd-v249.9+suse.82.g117bd7f14a.tar.xz diff --git a/systemd-v249.9+suse.79.g885e0b9126.tar.xz b/systemd-v249.9+suse.79.g885e0b9126.tar.xz deleted file mode 100644 index 6d53a8ef..00000000 --- a/systemd-v249.9+suse.79.g885e0b9126.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51c9904085a4c76526e49baf1e103afc39880d72247c971f91730d9cdebe9d99 -size 7279976 diff --git a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz new file mode 100644 index 00000000..048b7576 --- /dev/null +++ b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0 +size 7280500 diff --git a/systemd.changes b/systemd.changes index 384769f5..2921bd08 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 31 15:52:44 UTC 2022 - Franck Bui + +- Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 + + 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) + bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() + ------------------------------------------------------------------- Mon Jan 31 14:54:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f6007a22..106f792a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.79.g885e0b9126 +%define suse_version +suse.82.g117bd7f14a %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -193,10 +193,10 @@ Source202: files.container Source203: files.network Source204: files.devel -# Patches listed below are SUSE specific and should be kept at its -# minimum. We try hard to push our changes to upstream but sometimes -# they are only relevant for SUSE distros. Special rewards for those -# who will manage to get rid of one of them ! +# Patches listed below are openSUSE specific and should be kept at its +# minimum. We try hard to push our changes to upstream but sometimes they are +# only relevant for SUSE distros. Special rewards for those who will manage to +# get rid of one of them ! Patch1: 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch Patch2: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch Patch3: 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch From f09be28e735b16521b8678b0c011850aaed006a849d0a67e42249423da68dd86 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 1 Feb 2022 09:21:17 +0000 Subject: [PATCH 15/19] - Installation of libnss_mymachines.so depended on %{bootstrap} but it is actually installed when %{with machined} is true. - Call ldconfig when container subpackage is installed since it ships nss-mymachines NSS plug-in module. - Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1243 --- files.container | 2 +- systemd.changes | 12 +++++++++++- systemd.spec | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/files.container b/files.container index f7b3d670..c7fa8848 100644 --- a/files.container +++ b/files.container @@ -6,7 +6,6 @@ %if ! 0%{?bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn -%{_libdir}/libnss_mymachines.so.2 %{_mandir}/man1/systemd-nspawn.1.gz %{_mandir}/man5/systemd.nspawn.5.gz %{_mandir}/man8/libnss_mymachines.so.2.8.gz @@ -23,6 +22,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy %{_datadir}/zsh/site-functions/_machinectl %{_datadir}/zsh/site-functions/_sd_machines +%{_libdir}/libnss_mymachines.so.2 %{_mandir}/man1/machinectl.1.gz %{_mandir}/man5/org.freedesktop.machine1.5.gz %{_mandir}/man8/systemd-machined.8.gz diff --git a/systemd.changes b/systemd.changes index 2921bd08..f4ec6cc0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 1 09:18:25 UTC 2022 - Franck Bui + +- Installation of libnss_mymachines.so depended on %{bootstrap} but it is + actually installed when %{with machined} is true. + +- Call ldconfig when container subpackage is installed since it ships + nss-mymachines NSS plug-in module. + ------------------------------------------------------------------- Mon Jan 31 15:52:44 UTC 2022 - Franck Bui @@ -9,7 +18,8 @@ Mon Jan 31 15:52:44 UTC 2022 - Franck Bui ------------------------------------------------------------------- Mon Jan 31 14:54:07 UTC 2022 - Franck Bui -- Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch +- Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Given the fact that Factory no more ship SysV init scripts since several months, only scripts coming from 3rd party applications should remain which diff --git a/systemd.spec b/systemd.spec index 106f792a..401a7b42 100644 --- a/systemd.spec +++ b/systemd.spec @@ -380,7 +380,7 @@ see nss-mymachines(8) manpage for more details. %if %{with networkd} || %{with resolved} %package network -Summary: sytemd network manager and Network Name Resolution manager +Summary: systemd network and Network Name Resolution managers License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires @@ -1105,6 +1105,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf %if %{with machined} +%ldconfig if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -1123,6 +1124,9 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi + +%postun container +%ldconfig %endif %if ! 0%{?bootstrap} From 53f129a60dff245d10c7eb0b656f892131f979beee5199920acf0fe54bafbd24 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 2 Feb 2022 08:56:03 +0000 Subject: [PATCH 16/19] systemd-mini-doc should conflict with systemd-doc OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1244 --- systemd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemd.spec b/systemd.spec index 401a7b42..4ef6b10e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -228,6 +228,10 @@ drop-in replacement for sysvinit. Summary: HTML documentation for systemd License: LGPL-2.1-or-later Supplements: (systemd and patterns-base-documentation) +%if 0%{?bootstrap} +Provides: systemd-doc = %{version}-%{release} +Conflicts: systemd-doc +%endif %description doc The HTML documentation for systemd. From 7d7afbe97940a656b10ea1e9c57bb4144b6e39b6804b639f9e6f5554f29b929c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 2 Feb 2022 09:33:06 +0000 Subject: [PATCH 17/19] - Make more use of %{_unitdir} in files.{systemd,container} OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1245 --- files.container | 2 +- files.systemd | 550 ++++++++++++++++++++++++------------------------ systemd.changes | 5 + 3 files changed, 281 insertions(+), 276 deletions(-) diff --git a/files.container b/files.container index c7fa8848..faac2676 100644 --- a/files.container +++ b/files.container @@ -28,11 +28,11 @@ %{_mandir}/man8/systemd-machined.8.gz %{_mandir}/man8/systemd-machined.service.8.gz %{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh -%{_systemd_util_dir}/system/machines.target %{_systemd_util_dir}/systemd-machined %{_tmpfilesdir}/systemd-nspawn.conf %{_unitdir}/dbus-org.freedesktop.machine1.service %{_unitdir}/machine.slice +%{_unitdir}/machines.target %{_unitdir}/machines.target.wants/var-lib-machines.mount %{_unitdir}/remote-fs.target.wants/var-lib-machines.mount %{_unitdir}/systemd-machined.service diff --git a/files.systemd b/files.systemd index c9fd3a36..69c91fe0 100644 --- a/files.systemd +++ b/files.systemd @@ -57,35 +57,9 @@ %endif %dir %{_systemd_util_dir}/ntp-units.d %dir %{_systemd_util_dir}/scripts -%dir %{_systemd_util_dir}/system %dir %{_systemd_util_dir}/system-preset %dir %{_systemd_util_dir}/system-shutdown %dir %{_systemd_util_dir}/system-sleep -%dir %{_systemd_util_dir}/system/basic.target.wants -%dir %{_systemd_util_dir}/system/dbus.target.wants -%dir %{_systemd_util_dir}/system/default.target.wants -%dir %{_systemd_util_dir}/system/graphical.target.wants -%dir %{_systemd_util_dir}/system/halt.target.wants -%dir %{_systemd_util_dir}/system/initrd-root-device.target.wants -%dir %{_systemd_util_dir}/system/initrd-root-fs.target.wants -%dir %{_systemd_util_dir}/system/kexec.target.wants -%dir %{_systemd_util_dir}/system/local-fs.target.wants -%dir %{_systemd_util_dir}/system/multi-user.target.wants -%dir %{_systemd_util_dir}/system/poweroff.target.wants -%dir %{_systemd_util_dir}/system/reboot.target.wants -%dir %{_systemd_util_dir}/system/remote-fs.target.wants -%dir %{_systemd_util_dir}/system/rescue.target.wants -%if %{with sysvcompat} -%dir %{_systemd_util_dir}/system/runlevel1.target.wants -%dir %{_systemd_util_dir}/system/runlevel2.target.wants -%dir %{_systemd_util_dir}/system/runlevel3.target.wants -%dir %{_systemd_util_dir}/system/runlevel4.target.wants -%dir %{_systemd_util_dir}/system/runlevel5.target.wants -%endif -%dir %{_systemd_util_dir}/system/shutdown.target.wants -%dir %{_systemd_util_dir}/system/sockets.target.wants -%dir %{_systemd_util_dir}/system/sysinit.target.wants -%dir %{_systemd_util_dir}/system/timers.target.wants %dir %{_systemd_util_dir}/user %dir %{_systemd_util_dir}/user-generators %dir %{_systemd_util_dir}/user-preset @@ -93,6 +67,32 @@ %dir %{_systemdusergeneratordir} %dir %{_sysusersdir} %dir %{_tmpfilesdir} +%dir %{_unitdir} +%dir %{_unitdir}/basic.target.wants +%dir %{_unitdir}/dbus.target.wants +%dir %{_unitdir}/default.target.wants +%dir %{_unitdir}/graphical.target.wants +%dir %{_unitdir}/halt.target.wants +%dir %{_unitdir}/initrd-root-device.target.wants +%dir %{_unitdir}/initrd-root-fs.target.wants +%dir %{_unitdir}/kexec.target.wants +%dir %{_unitdir}/local-fs.target.wants +%dir %{_unitdir}/multi-user.target.wants +%dir %{_unitdir}/poweroff.target.wants +%dir %{_unitdir}/reboot.target.wants +%dir %{_unitdir}/remote-fs.target.wants +%dir %{_unitdir}/rescue.target.wants +%if %{with sysvcompat} +%dir %{_unitdir}/runlevel1.target.wants +%dir %{_unitdir}/runlevel2.target.wants +%dir %{_unitdir}/runlevel3.target.wants +%dir %{_unitdir}/runlevel4.target.wants +%dir %{_unitdir}/runlevel5.target.wants +%endif +%dir %{_unitdir}/shutdown.target.wants +%dir %{_unitdir}/sockets.target.wants +%dir %{_unitdir}/sysinit.target.wants +%dir %{_unitdir}/timers.target.wants %doc %{_modprobedir}/README %doc %{_sysctldir}/README %doc %{_sysusersdir}/README @@ -484,255 +484,6 @@ %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh %{_systemd_util_dir}/system-preset/99-default.preset -%{_systemd_util_dir}/system/after-local.service -%{_systemd_util_dir}/system/autovt@.service -%{_systemd_util_dir}/system/basic.target -%{_systemd_util_dir}/system/blockdev@.target -%{_systemd_util_dir}/system/bluetooth.target -%{_systemd_util_dir}/system/boot-complete.target -%{_systemd_util_dir}/system/console-getty.service -%{_systemd_util_dir}/system/container-getty@.service -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/cryptsetup-pre.target -%{_systemd_util_dir}/system/cryptsetup.target -%endif -%{_systemd_util_dir}/system/ctrl-alt-del.target -%{_systemd_util_dir}/system/dbus-org.freedesktop.hostname1.service -%{_systemd_util_dir}/system/dbus-org.freedesktop.locale1.service -%{_systemd_util_dir}/system/dbus-org.freedesktop.login1.service -%{_systemd_util_dir}/system/dbus-org.freedesktop.timedate1.service -%{_systemd_util_dir}/system/debug-shell.service -%{_systemd_util_dir}/system/default.target -%{_systemd_util_dir}/system/dev-hugepages.mount -%{_systemd_util_dir}/system/dev-mqueue.mount -%{_systemd_util_dir}/system/emergency.service -%{_systemd_util_dir}/system/emergency.target -%{_systemd_util_dir}/system/exit.target -%{_systemd_util_dir}/system/final.target -%{_systemd_util_dir}/system/first-boot-complete.target -%{_systemd_util_dir}/system/getty-pre.target -%{_systemd_util_dir}/system/getty.target -%{_systemd_util_dir}/system/getty@.service -%{_systemd_util_dir}/system/graphical.target -%if %{with sysvcompat} -%{_systemd_util_dir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service -%endif -%{_systemd_util_dir}/system/halt.target -%{_systemd_util_dir}/system/hibernate.target -%{_systemd_util_dir}/system/hybrid-sleep.target -%{_systemd_util_dir}/system/initrd-cleanup.service -%{_systemd_util_dir}/system/initrd-fs.target -%{_systemd_util_dir}/system/initrd-parse-etc.service -%{_systemd_util_dir}/system/initrd-root-device.target -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/initrd-root-device.target.wants/remote-cryptsetup.target -%{_systemd_util_dir}/system/initrd-root-device.target.wants/remote-veritysetup.target -%endif -%{_systemd_util_dir}/system/initrd-root-fs.target -%{_systemd_util_dir}/system/initrd-switch-root.service -%{_systemd_util_dir}/system/initrd-switch-root.target -%{_systemd_util_dir}/system/initrd-usr-fs.target -%{_systemd_util_dir}/system/initrd.target -%{_systemd_util_dir}/system/kexec.target -%{_systemd_util_dir}/system/local-fs-pre.target -%{_systemd_util_dir}/system/local-fs.target -%{_systemd_util_dir}/system/local-fs.target.wants/tmp.mount -%if %{with sysvcompat} -%{_systemd_util_dir}/system/local-fs.target.wants/var-lock.mount -%{_systemd_util_dir}/system/local-fs.target.wants/var-run.mount -%endif -%{_systemd_util_dir}/system/modprobe@.service -%{_systemd_util_dir}/system/multi-user.target -%{_systemd_util_dir}/system/multi-user.target.wants/after-local.service -%{_systemd_util_dir}/system/multi-user.target.wants/getty.target -%{_systemd_util_dir}/system/multi-user.target.wants/systemd-logind.service -%if %{with sysvcompat} -%{_systemd_util_dir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service -%endif -%{_systemd_util_dir}/system/multi-user.target.wants/systemd-user-sessions.service -%{_systemd_util_dir}/system/network-online.target -%{_systemd_util_dir}/system/network-pre.target -%{_systemd_util_dir}/system/network.target -%{_systemd_util_dir}/system/nss-lookup.target -%{_systemd_util_dir}/system/nss-user-lookup.target -%{_systemd_util_dir}/system/paths.target -%{_systemd_util_dir}/system/poweroff.target -%{_systemd_util_dir}/system/printer.target -%{_systemd_util_dir}/system/proc-sys-fs-binfmt_misc.automount -%{_systemd_util_dir}/system/proc-sys-fs-binfmt_misc.mount -%{_systemd_util_dir}/system/quotaon.service -%if %{with sysvcompat} -%{_systemd_util_dir}/system/rc-local.service -%endif -%{_systemd_util_dir}/system/reboot.target -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/remote-cryptsetup.target -%endif -%{_systemd_util_dir}/system/remote-fs-pre.target -%{_systemd_util_dir}/system/remote-fs.target -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/remote-veritysetup.target -%endif -%{_systemd_util_dir}/system/rescue.service -%{_systemd_util_dir}/system/rescue.target -%if %{with sysvcompat} -%{_systemd_util_dir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service -%endif -%{_systemd_util_dir}/system/rpcbind.target -%if %{with sysvcompat} -%{_systemd_util_dir}/system/runlevel0.target -%{_systemd_util_dir}/system/runlevel1.target -%{_systemd_util_dir}/system/runlevel2.target -%{_systemd_util_dir}/system/runlevel3.target -%{_systemd_util_dir}/system/runlevel4.target -%{_systemd_util_dir}/system/runlevel5.target -%{_systemd_util_dir}/system/runlevel6.target -%endif -%{_systemd_util_dir}/system/serial-getty@.service -%{_systemd_util_dir}/system/shutdown.target -%{_systemd_util_dir}/system/sigpwr.target -%{_systemd_util_dir}/system/sleep.target -%{_systemd_util_dir}/system/slices.target -%{_systemd_util_dir}/system/smartcard.target -%{_systemd_util_dir}/system/sockets.target -%if %{with sysvcompat} -%{_systemd_util_dir}/system/sockets.target.wants/systemd-initctl.socket -%endif -%{_systemd_util_dir}/system/sockets.target.wants/systemd-journald-dev-log.socket -%{_systemd_util_dir}/system/sockets.target.wants/systemd-journald.socket -%{_systemd_util_dir}/system/sound.target -%{_systemd_util_dir}/system/suspend-then-hibernate.target -%{_systemd_util_dir}/system/suspend.target -%{_systemd_util_dir}/system/swap.target -%{_systemd_util_dir}/system/sys-fs-fuse-connections.mount -%{_systemd_util_dir}/system/sys-kernel-config.mount -%{_systemd_util_dir}/system/sys-kernel-debug.mount -%{_systemd_util_dir}/system/sys-kernel-tracing.mount -%{_systemd_util_dir}/system/sysinit.target -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/sysinit.target.wants/cryptsetup.target -%endif -%{_systemd_util_dir}/system/sysinit.target.wants/dev-hugepages.mount -%{_systemd_util_dir}/system/sysinit.target.wants/dev-mqueue.mount -%{_systemd_util_dir}/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount -%{_systemd_util_dir}/system/sysinit.target.wants/sys-fs-fuse-connections.mount -%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-config.mount -%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-debug.mount -%{_systemd_util_dir}/system/sysinit.target.wants/sys-kernel-tracing.mount -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-ask-password-console.path -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-binfmt.service -%if %{with sd_boot} -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-boot-system-token.service -%endif -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-firstboot.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journal-catalog-update.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journal-flush.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-journald.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-machine-id-commit.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-modules-load.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-random-seed.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-sysctl.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-sysusers.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-tmpfiles-setup.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-update-done.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-update-utmp.service -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/sysinit.target.wants/veritysetup.target -%endif -%{_systemd_util_dir}/system/syslog.socket -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/system-systemd\x2dcryptsetup.slice -%endif -%{_systemd_util_dir}/system/system-update-cleanup.service -%{_systemd_util_dir}/system/system-update-pre.target -%{_systemd_util_dir}/system/system-update.target -%{_systemd_util_dir}/system/systemd-ask-password-console.path -%{_systemd_util_dir}/system/systemd-ask-password-console.service -%{_systemd_util_dir}/system/systemd-ask-password-wall.path -%{_systemd_util_dir}/system/systemd-ask-password-wall.service -%{_systemd_util_dir}/system/systemd-backlight@.service -%{_systemd_util_dir}/system/systemd-binfmt.service -%if %{with sd_boot} -%{_systemd_util_dir}/system/systemd-bless-boot.service -%endif -%{_systemd_util_dir}/system/systemd-boot-check-no-failures.service -%if %{with sd_boot} -%{_systemd_util_dir}/system/systemd-boot-system-token.service -%endif -%{_systemd_util_dir}/system/systemd-exit.service -%{_systemd_util_dir}/system/systemd-firstboot.service -%{_systemd_util_dir}/system/systemd-fsck-root.service -%{_systemd_util_dir}/system/systemd-fsck@.service -%{_systemd_util_dir}/system/systemd-halt.service -%{_systemd_util_dir}/system/systemd-hibernate-resume@.service -%{_systemd_util_dir}/system/systemd-hibernate.service -%{_systemd_util_dir}/system/systemd-hostnamed.service -%{_systemd_util_dir}/system/systemd-hybrid-sleep.service -%if %{with sysvcompat} -%{_systemd_util_dir}/system/systemd-initctl.service -%{_systemd_util_dir}/system/systemd-initctl.socket -%endif -%{_systemd_util_dir}/system/systemd-journal-catalog-update.service -%{_systemd_util_dir}/system/systemd-journal-flush.service -%{_systemd_util_dir}/system/systemd-journald-dev-log.socket -%{_systemd_util_dir}/system/systemd-journald-varlink@.socket -%{_systemd_util_dir}/system/systemd-journald.service -%{_systemd_util_dir}/system/systemd-journald.socket -%{_systemd_util_dir}/system/systemd-journald@.service -%{_systemd_util_dir}/system/systemd-journald@.socket -%{_systemd_util_dir}/system/systemd-kexec.service -%{_systemd_util_dir}/system/systemd-localed.service -%{_systemd_util_dir}/system/systemd-logind.service -%{_systemd_util_dir}/system/systemd-machine-id-commit.service -%{_systemd_util_dir}/system/systemd-modules-load.service -%{_systemd_util_dir}/system/systemd-poweroff.service -%{_systemd_util_dir}/system/systemd-quotacheck.service -%{_systemd_util_dir}/system/systemd-random-seed.service -%{_systemd_util_dir}/system/systemd-reboot.service -%{_systemd_util_dir}/system/systemd-remount-fs.service -%{_systemd_util_dir}/system/systemd-rfkill.service -%{_systemd_util_dir}/system/systemd-rfkill.socket -%{_systemd_util_dir}/system/systemd-suspend-then-hibernate.service -%{_systemd_util_dir}/system/systemd-suspend.service -%{_systemd_util_dir}/system/systemd-sysctl.service -%{_systemd_util_dir}/system/systemd-sysext.service -%{_systemd_util_dir}/system/systemd-sysusers.service -%{_systemd_util_dir}/system/systemd-time-wait-sync.service -%{_systemd_util_dir}/system/systemd-timedated.service -%{_systemd_util_dir}/system/systemd-timesyncd.service -%{_systemd_util_dir}/system/systemd-tmpfiles-clean.service -%{_systemd_util_dir}/system/systemd-tmpfiles-clean.timer -%{_systemd_util_dir}/system/systemd-tmpfiles-setup-dev.service -%{_systemd_util_dir}/system/systemd-tmpfiles-setup.service -%{_systemd_util_dir}/system/systemd-update-done.service -%if %{with sysvcompat} -%{_systemd_util_dir}/system/systemd-update-utmp-runlevel.service -%endif -%{_systemd_util_dir}/system/systemd-update-utmp.service -%{_systemd_util_dir}/system/systemd-user-sessions.service -%{_systemd_util_dir}/system/systemd-vconsole-setup.service -%{_systemd_util_dir}/system/systemd-volatile-root.service -%{_systemd_util_dir}/system/time-set.target -%{_systemd_util_dir}/system/time-sync.target -%{_systemd_util_dir}/system/timers.target -%{_systemd_util_dir}/system/timers.target.wants/systemd-tmpfiles-clean.timer -%{_systemd_util_dir}/system/tmp.mount -%{_systemd_util_dir}/system/umount.target -%{_systemd_util_dir}/system/usb-gadget.target -%{_systemd_util_dir}/system/user-.slice.d -%{_systemd_util_dir}/system/user-.slice.d/10-defaults.conf -%{_systemd_util_dir}/system/user-runtime-dir@.service -%{_systemd_util_dir}/system/user.slice -%{_systemd_util_dir}/system/user@.service -%if %{with sysvcompat} -%{_systemd_util_dir}/system/var-lock.mount -%{_systemd_util_dir}/system/var-run.mount -%endif -%if ! 0%{?bootstrap} -%{_systemd_util_dir}/system/veritysetup-pre.target -%{_systemd_util_dir}/system/veritysetup.target -%endif %{_systemd_util_dir}/systemd %{_systemd_util_dir}/systemd-ac-power %{_systemd_util_dir}/systemd-backlight @@ -842,6 +593,255 @@ %{_udevrulesdir}/71-seat.rules %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules +%{_unitdir}/after-local.service +%{_unitdir}/autovt@.service +%{_unitdir}/basic.target +%{_unitdir}/blockdev@.target +%{_unitdir}/bluetooth.target +%{_unitdir}/boot-complete.target +%{_unitdir}/console-getty.service +%{_unitdir}/container-getty@.service +%if ! 0%{?bootstrap} +%{_unitdir}/cryptsetup-pre.target +%{_unitdir}/cryptsetup.target +%endif +%{_unitdir}/ctrl-alt-del.target +%{_unitdir}/dbus-org.freedesktop.hostname1.service +%{_unitdir}/dbus-org.freedesktop.locale1.service +%{_unitdir}/dbus-org.freedesktop.login1.service +%{_unitdir}/dbus-org.freedesktop.timedate1.service +%{_unitdir}/debug-shell.service +%{_unitdir}/default.target +%{_unitdir}/dev-hugepages.mount +%{_unitdir}/dev-mqueue.mount +%{_unitdir}/emergency.service +%{_unitdir}/emergency.target +%{_unitdir}/exit.target +%{_unitdir}/final.target +%{_unitdir}/first-boot-complete.target +%{_unitdir}/getty-pre.target +%{_unitdir}/getty.target +%{_unitdir}/getty@.service +%{_unitdir}/graphical.target +%if %{with sysvcompat} +%{_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/halt.target +%{_unitdir}/hibernate.target +%{_unitdir}/hybrid-sleep.target +%{_unitdir}/initrd-cleanup.service +%{_unitdir}/initrd-fs.target +%{_unitdir}/initrd-parse-etc.service +%{_unitdir}/initrd-root-device.target +%if ! 0%{?bootstrap} +%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target +%endif +%{_unitdir}/initrd-root-fs.target +%{_unitdir}/initrd-switch-root.service +%{_unitdir}/initrd-switch-root.target +%{_unitdir}/initrd-usr-fs.target +%{_unitdir}/initrd.target +%{_unitdir}/kexec.target +%{_unitdir}/local-fs-pre.target +%{_unitdir}/local-fs.target +%{_unitdir}/local-fs.target.wants/tmp.mount +%if %{with sysvcompat} +%{_unitdir}/local-fs.target.wants/var-lock.mount +%{_unitdir}/local-fs.target.wants/var-run.mount +%endif +%{_unitdir}/modprobe@.service +%{_unitdir}/multi-user.target +%{_unitdir}/multi-user.target.wants/after-local.service +%{_unitdir}/multi-user.target.wants/getty.target +%{_unitdir}/multi-user.target.wants/systemd-logind.service +%if %{with sysvcompat} +%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/multi-user.target.wants/systemd-user-sessions.service +%{_unitdir}/network-online.target +%{_unitdir}/network-pre.target +%{_unitdir}/network.target +%{_unitdir}/nss-lookup.target +%{_unitdir}/nss-user-lookup.target +%{_unitdir}/paths.target +%{_unitdir}/poweroff.target +%{_unitdir}/printer.target +%{_unitdir}/proc-sys-fs-binfmt_misc.automount +%{_unitdir}/proc-sys-fs-binfmt_misc.mount +%{_unitdir}/quotaon.service +%if %{with sysvcompat} +%{_unitdir}/rc-local.service +%endif +%{_unitdir}/reboot.target +%if ! 0%{?bootstrap} +%{_unitdir}/remote-cryptsetup.target +%endif +%{_unitdir}/remote-fs-pre.target +%{_unitdir}/remote-fs.target +%if ! 0%{?bootstrap} +%{_unitdir}/remote-veritysetup.target +%endif +%{_unitdir}/rescue.service +%{_unitdir}/rescue.target +%if %{with sysvcompat} +%{_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/rpcbind.target +%if %{with sysvcompat} +%{_unitdir}/runlevel0.target +%{_unitdir}/runlevel1.target +%{_unitdir}/runlevel2.target +%{_unitdir}/runlevel3.target +%{_unitdir}/runlevel4.target +%{_unitdir}/runlevel5.target +%{_unitdir}/runlevel6.target +%endif +%{_unitdir}/serial-getty@.service +%{_unitdir}/shutdown.target +%{_unitdir}/sigpwr.target +%{_unitdir}/sleep.target +%{_unitdir}/slices.target +%{_unitdir}/smartcard.target +%{_unitdir}/sockets.target +%if %{with sysvcompat} +%{_unitdir}/sockets.target.wants/systemd-initctl.socket +%endif +%{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket +%{_unitdir}/sockets.target.wants/systemd-journald.socket +%{_unitdir}/sound.target +%{_unitdir}/suspend-then-hibernate.target +%{_unitdir}/suspend.target +%{_unitdir}/swap.target +%{_unitdir}/sys-fs-fuse-connections.mount +%{_unitdir}/sys-kernel-config.mount +%{_unitdir}/sys-kernel-debug.mount +%{_unitdir}/sys-kernel-tracing.mount +%{_unitdir}/sysinit.target +%if ! 0%{?bootstrap} +%{_unitdir}/sysinit.target.wants/cryptsetup.target +%endif +%{_unitdir}/sysinit.target.wants/dev-hugepages.mount +%{_unitdir}/sysinit.target.wants/dev-mqueue.mount +%{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount +%{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-config.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-debug.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount +%{_unitdir}/sysinit.target.wants/systemd-ask-password-console.path +%{_unitdir}/sysinit.target.wants/systemd-binfmt.service +%if %{with sd_boot} +%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service +%endif +%{_unitdir}/sysinit.target.wants/systemd-firstboot.service +%{_unitdir}/sysinit.target.wants/systemd-journal-catalog-update.service +%{_unitdir}/sysinit.target.wants/systemd-journal-flush.service +%{_unitdir}/sysinit.target.wants/systemd-journald.service +%{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service +%{_unitdir}/sysinit.target.wants/systemd-modules-load.service +%{_unitdir}/sysinit.target.wants/systemd-random-seed.service +%{_unitdir}/sysinit.target.wants/systemd-sysctl.service +%{_unitdir}/sysinit.target.wants/systemd-sysusers.service +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service +%{_unitdir}/sysinit.target.wants/systemd-update-done.service +%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service +%if ! 0%{?bootstrap} +%{_unitdir}/sysinit.target.wants/veritysetup.target +%endif +%{_unitdir}/syslog.socket +%if ! 0%{?bootstrap} +%{_unitdir}/system-systemd\x2dcryptsetup.slice +%endif +%{_unitdir}/system-update-cleanup.service +%{_unitdir}/system-update-pre.target +%{_unitdir}/system-update.target +%{_unitdir}/systemd-ask-password-console.path +%{_unitdir}/systemd-ask-password-console.service +%{_unitdir}/systemd-ask-password-wall.path +%{_unitdir}/systemd-ask-password-wall.service +%{_unitdir}/systemd-backlight@.service +%{_unitdir}/systemd-binfmt.service +%if %{with sd_boot} +%{_unitdir}/systemd-bless-boot.service +%endif +%{_unitdir}/systemd-boot-check-no-failures.service +%if %{with sd_boot} +%{_unitdir}/systemd-boot-system-token.service +%endif +%{_unitdir}/systemd-exit.service +%{_unitdir}/systemd-firstboot.service +%{_unitdir}/systemd-fsck-root.service +%{_unitdir}/systemd-fsck@.service +%{_unitdir}/systemd-halt.service +%{_unitdir}/systemd-hibernate-resume@.service +%{_unitdir}/systemd-hibernate.service +%{_unitdir}/systemd-hostnamed.service +%{_unitdir}/systemd-hybrid-sleep.service +%if %{with sysvcompat} +%{_unitdir}/systemd-initctl.service +%{_unitdir}/systemd-initctl.socket +%endif +%{_unitdir}/systemd-journal-catalog-update.service +%{_unitdir}/systemd-journal-flush.service +%{_unitdir}/systemd-journald-dev-log.socket +%{_unitdir}/systemd-journald-varlink@.socket +%{_unitdir}/systemd-journald.service +%{_unitdir}/systemd-journald.socket +%{_unitdir}/systemd-journald@.service +%{_unitdir}/systemd-journald@.socket +%{_unitdir}/systemd-kexec.service +%{_unitdir}/systemd-localed.service +%{_unitdir}/systemd-logind.service +%{_unitdir}/systemd-machine-id-commit.service +%{_unitdir}/systemd-modules-load.service +%{_unitdir}/systemd-poweroff.service +%{_unitdir}/systemd-quotacheck.service +%{_unitdir}/systemd-random-seed.service +%{_unitdir}/systemd-reboot.service +%{_unitdir}/systemd-remount-fs.service +%{_unitdir}/systemd-rfkill.service +%{_unitdir}/systemd-rfkill.socket +%{_unitdir}/systemd-suspend-then-hibernate.service +%{_unitdir}/systemd-suspend.service +%{_unitdir}/systemd-sysctl.service +%{_unitdir}/systemd-sysext.service +%{_unitdir}/systemd-sysusers.service +%{_unitdir}/systemd-time-wait-sync.service +%{_unitdir}/systemd-timedated.service +%{_unitdir}/systemd-timesyncd.service +%{_unitdir}/systemd-tmpfiles-clean.service +%{_unitdir}/systemd-tmpfiles-clean.timer +%{_unitdir}/systemd-tmpfiles-setup-dev.service +%{_unitdir}/systemd-tmpfiles-setup.service +%{_unitdir}/systemd-update-done.service +%if %{with sysvcompat} +%{_unitdir}/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/systemd-update-utmp.service +%{_unitdir}/systemd-user-sessions.service +%{_unitdir}/systemd-vconsole-setup.service +%{_unitdir}/systemd-volatile-root.service +%{_unitdir}/time-set.target +%{_unitdir}/time-sync.target +%{_unitdir}/timers.target +%{_unitdir}/timers.target.wants/systemd-tmpfiles-clean.timer +%{_unitdir}/tmp.mount +%{_unitdir}/umount.target +%{_unitdir}/usb-gadget.target +%{_unitdir}/user-.slice.d +%{_unitdir}/user-.slice.d/10-defaults.conf +%{_unitdir}/user-runtime-dir@.service +%{_unitdir}/user.slice +%{_unitdir}/user@.service +%if %{with sysvcompat} +%{_unitdir}/var-lock.mount +%{_unitdir}/var-run.mount +%endif +%if ! 0%{?bootstrap} +%{_unitdir}/veritysetup-pre.target +%{_unitdir}/veritysetup.target +%endif %if %{with split_usr} /bin/systemctl %endif diff --git a/systemd.changes b/systemd.changes index f4ec6cc0..35b4c04f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 2 09:33:14 UTC 2022 - Franck Bui + +- Make more use of %{_unitdir} in files.{systemd,container} + ------------------------------------------------------------------- Tue Feb 1 09:18:25 UTC 2022 - Franck Bui From 5e29814e055ccff8da80aaea39101061a51ca470b5352c579c9f04a20222d417 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 4 Feb 2022 15:23:12 +0000 Subject: [PATCH 18/19] - Always create systemd-network system user, even if systemd-networkd is not installed (bsc#1195559) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1246 --- files.network | 1 - files.systemd | 3 +++ systemd.changes | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/files.network b/files.network index e6aa5e60..4118d63d 100644 --- a/files.network +++ b/files.network @@ -29,7 +29,6 @@ %{_systemd_util_dir}/network/80-wifi-station.network.example %{_systemd_util_dir}/systemd-networkd %{_systemd_util_dir}/systemd-networkd-wait-online -%{_sysusersdir}/systemd-network.conf %{_unitdir}/systemd-networkd-wait-online.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket diff --git a/files.systemd b/files.systemd index 69c91fe0..dbbf07db 100644 --- a/files.systemd +++ b/files.systemd @@ -582,6 +582,9 @@ %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf +# Yes, systemd-network.conf really belongs here, see +# https://github.com/systemd/systemd/pull/22416#issuecomment-1029828592 +%{_sysusersdir}/systemd-network.conf %{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/suse.conf diff --git a/systemd.changes b/systemd.changes index 35b4c04f..0ab20e79 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 4 15:22:43 UTC 2022 - Franck Bui + +- Always create systemd-network system user, even if systemd-networkd is not + installed (bsc#1195559) + ------------------------------------------------------------------- Wed Feb 2 09:33:14 UTC 2022 - Franck Bui From 21cb7a03d07e8d69b77cfc0af7233ab99f60a9de8985de13d9f7674b261d9713 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 4 Feb 2022 16:35:05 +0000 Subject: [PATCH 19/19] fix previous commit for the mini flavor OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1247 --- files.systemd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/files.systemd b/files.systemd index dbbf07db..1a2d79a8 100644 --- a/files.systemd +++ b/files.systemd @@ -582,9 +582,11 @@ %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf +%if %{with networkd} # Yes, systemd-network.conf really belongs here, see # https://github.com/systemd/systemd/pull/22416#issuecomment-1029828592 %{_sysusersdir}/systemd-network.conf +%endif %{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/suse.conf