SHA256
1
0
forked from pool/systemd

- Move nss-systemd and nss-myhostname NSS modules into the main package

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1313
This commit is contained in:
Franck Bui 2022-09-21 07:49:53 +00:00 committed by Git OBS Bridge
parent 713f9ebffa
commit a0873f1871
4 changed files with 22 additions and 51 deletions

View File

@ -9,4 +9,3 @@ systemd
post "<prefix>%{_sbindir}/pam-config -a --systemd || :" post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
libsystemd0 libsystemd0
libudev1 libudev1
nss-myhostname

View File

@ -221,6 +221,8 @@
%{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_CN.catalog
%{_journalcatalogdir}/systemd.zh_TW.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog
%if %{without bootstrap} %if %{without bootstrap}
%{_libdir}/libnss_myhostname.so.2
%{_libdir}/libnss_systemd.so.2
%{_mandir}/man1/busctl.1.gz %{_mandir}/man1/busctl.1.gz
%{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/hostnamectl.1.gz
%{_mandir}/man1/init.1.gz %{_mandir}/man1/init.1.gz
@ -328,6 +330,10 @@
%{_mandir}/man7/systemd.time.7.gz %{_mandir}/man7/systemd.time.7.gz
%{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz
%{_mandir}/man8/halt.8.gz %{_mandir}/man8/halt.8.gz
%{_mandir}/man8/libnss_myhostname.so.2.8.gz
%{_mandir}/man8/libnss_systemd.so.2.8.gz
%{_mandir}/man8/nss-myhostname.8.gz
%{_mandir}/man8/nss-systemd.8.gz
%{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/pam_systemd.8.gz
%{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/poweroff.8.gz
%{_mandir}/man8/reboot.8.gz %{_mandir}/man8/reboot.8.gz

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 21 07:48:58 UTC 2022 - Franck Bui <fbui@suse.com>
- Move nss-systemd and nss-myhostname NSS modules into the main package
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 15:07:58 UTC 2022 - Franck Bui <fbui@suse.com> Tue Sep 20 15:07:58 UTC 2022 - Franck Bui <fbui@suse.com>

View File

@ -153,6 +153,10 @@ Provides: sbin_init
Provides: sysvinit:/sbin/init Provides: sysvinit:/sbin/init
Conflicts: sbin_init Conflicts: sbin_init
Conflicts: sysvinit Conflicts: sysvinit
Obsoletes: nss-systemd < %{version}-%{release}
Provides: nss-systemd = %{version}-%{release}
Obsoletes: nss-myhostname < %{version}-%{release}
Provides: nss-myhostname = %{version}-%{release}
Provides: systemd-logger = %{version}-%{release} Provides: systemd-logger = %{version}-%{release}
Obsoletes: systemd-logger < %{version}-%{release} Obsoletes: systemd-logger < %{version}-%{release}
Provides: systemd-sysvinit = %{version}-%{release} Provides: systemd-sysvinit = %{version}-%{release}
@ -472,34 +476,6 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html
https://systemd.io/PORTABLE_SERVICES https://systemd.io/PORTABLE_SERVICES
%endif %endif
%if %{without bootstrap}
%package -n nss-systemd
Summary: Plugin for local virtual host name resolution
License: LGPL-2.1-or-later
%description -n nss-systemd
This package contains a plugin for the Name Service Switch (NSS),
which enables resolution of all dynamically allocated service
users. (See the DynamicUser= setting in unit files.)
To activate this NSS module, you will need to include it in
/etc/nsswitch.conf, see nss-systemd(8) manpage for more details.
%package -n nss-myhostname
Summary: Plugin for local system host name resolution
License: LGPL-2.1-or-later
%description -n nss-myhostname
This package contains a plug-in module for the Name Service Switch
(NSS), primarly providing hostname resolution for the locally
configured system hostname as returned by gethostname(2). For example,
it resolves the local hostname to locally configured IP addresses, as
well as "localhost" to 127.0.0.1/::1.
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 journal_remote} %if %{with journal_remote}
%package journal-remote %package journal-remote
Summary: Gateway for serving journal events over the network using HTTP Summary: Gateway for serving journal events over the network using HTTP
@ -1003,6 +979,8 @@ fi
%if %{without bootstrap} %if %{without bootstrap}
pam-config --add --systemd || : pam-config --add --systemd || :
# Run ldconfig for nss-systemd and nss-myhostname NSS modules.
%ldconfig
%endif %endif
# systemd-sysusers is not available in %pre so this needs to be done # systemd-sysusers is not available in %pre so this needs to be done
@ -1022,7 +1000,7 @@ systemctl daemon-reexec || :
# only understood by the latest version of the user manager and the # only understood by the latest version of the user manager and the
# user service is started before the user manager get reexecuted. But # user service is started before the user manager get reexecuted. But
# this case is very unlikely especially since we don't restart any # this case is very unlikely especially since we don't restart any
# user service for now on. # user service for now.
# #
# Before doing this, we unfortunately have to wait until users will # Before doing this, we unfortunately have to wait until users will
# reexec their user manager (by either rebooting or restarting their # reexec their user manager (by either rebooting or restarting their
@ -1162,11 +1140,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules
%posttrans -n udev%{?mini} %posttrans -n udev%{?mini}
%regenerate_initrd_posttrans %regenerate_initrd_posttrans
%post -n libudev%{?mini}1 -p /sbin/ldconfig %post -n libudev%{?mini}1 -p %ldconfig
%post -n libsystemd0%{?mini} -p /sbin/ldconfig %post -n libsystemd0%{?mini} -p %ldconfig
%postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libudev%{?mini}1 -p %ldconfig
%postun -n libsystemd0%{?mini} -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p %ldconfig
%post container %post container
%tmpfiles_create systemd-nspawn.conf %tmpfiles_create systemd-nspawn.conf
@ -1200,11 +1178,6 @@ fi
%sysusers_create systemd-coredump.conf %sysusers_create systemd-coredump.conf
%endif %endif
%if %{without bootstrap}
%ldconfig_scriptlets -n nss-myhostname
%ldconfig_scriptlets -n nss-systemd
%endif
%if %{with journal_remote} %if %{with journal_remote}
%pre journal-remote %pre journal-remote
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
@ -1378,18 +1351,6 @@ fi
%if %{without bootstrap} %if %{without bootstrap}
%files lang -f systemd.lang %files lang -f systemd.lang
%files -n nss-myhostname
%defattr(-, root, root)
%{_libdir}/*nss_myhostname*
%{_mandir}/man8/libnss_myhostname.*
%{_mandir}/man8/nss-myhostname.*
%files -n nss-systemd
%defattr(-, root, root)
%{_libdir}/libnss_systemd.so*
%{_mandir}/man8/libnss_systemd.so.*
%{_mandir}/man8/nss-systemd.*
%endif %endif
%if %{with journal_remote} %if %{with journal_remote}