From f09be28e735b16521b8678b0c011850aaed006a849d0a67e42249423da68dd86 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 1 Feb 2022 09:21:17 +0000 Subject: [PATCH] - 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}