diff --git a/files.experimental b/files.experimental index 0cea03ba..728a5c86 100644 --- a/files.experimental +++ b/files.experimental @@ -9,7 +9,6 @@ %{_bindir}/homectl %{_bindir}/oomctl %{_bindir}/systemd-repart -%{_bindir}/userdbctl %{_datadir}/bash-completion/completions/homectl %{_datadir}/bash-completion/completions/oomctl %{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml @@ -29,7 +28,6 @@ %{_mandir}/man1/systemd-measure.1.gz %{_mandir}/man1/ukify.1.gz %endif -%{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.d.5.gz %{_mandir}/man5/oomd.conf.5.gz @@ -59,8 +57,6 @@ %{_mandir}/man8/systemd-sysupdate.8.gz %{_mandir}/man8/systemd-sysupdate.service.8.gz %{_mandir}/man8/systemd-sysupdate.timer.8.gz -%{_mandir}/man8/systemd-userdbd.8.gz -%{_mandir}/man8/systemd-userdbd.service.8.gz %{_pam_moduledir}/pam_systemd_home.so %{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service @@ -74,7 +70,6 @@ %{_systemd_util_dir}/systemd-pcrphase %endif %{_systemd_util_dir}/systemd-sysupdate -%{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork %if %{with sd_boot} %{_systemd_util_dir}/ukify @@ -103,5 +98,3 @@ %{_unitdir}/systemd-sysupdate-reboot.timer %{_unitdir}/systemd-sysupdate.service %{_unitdir}/systemd-sysupdate.timer -%{_unitdir}/systemd-userdbd.service -%{_unitdir}/systemd-userdbd.socket diff --git a/files.systemd b/files.systemd index ec052ed4..a400ca8d 100644 --- a/files.systemd +++ b/files.systemd @@ -123,6 +123,7 @@ %{_bindir}/systemd-umount %{_bindir}/timedatectl %if %{without bootstrap} +%{_bindir}/userdbctl %{_datadir}/bash-completion/completions/busctl %{_datadir}/bash-completion/completions/hostnamectl %{_datadir}/bash-completion/completions/journalctl @@ -261,6 +262,7 @@ %{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd.1.gz %{_mandir}/man1/timedatectl.1.gz +%{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/binfmt.d.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz @@ -394,6 +396,8 @@ %{_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-userdbd.8.gz +%{_mandir}/man8/systemd-userdbd.service.8.gz %{_mandir}/man8/systemd-xdg-autostart-generator.8.gz %endif %{_modprobedir}/systemd.conf @@ -430,6 +434,9 @@ %{_systemd_util_dir}/systemd-update-utmp %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions +%if %{without bootstrap} +%{_systemd_util_dir}/systemd-userdbd +%endif %{_systemd_util_dir}/systemd-xdg-autostart-condition %{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator %{_systemd_util_dir}/user-preset/90-systemd.preset @@ -608,6 +615,10 @@ %{_unitdir}/systemd-update-done.service %{_unitdir}/systemd-update-utmp.service %{_unitdir}/systemd-user-sessions.service +%if %{without bootstrap} +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket +%endif %{_unitdir}/time-set.target %{_unitdir}/time-sync.target %{_unitdir}/timers.target diff --git a/systemd.changes b/systemd.changes index 2989c218..bb74fbaf 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 24 14:29:35 UTC 2023 - Franck Bui + +- systemd-userdb is no more considered as experimental (jsc#PED-2668) + + As such it's been moved to the main package. + ------------------------------------------------------------------- Tue Jul 18 08:54:44 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 78a43905..ece961e1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -642,7 +642,7 @@ change without the usual backwards-compatibility promises. Components that turn out to be stable and considered as fully supported will be merged into the main package or moved into a dedicated package. -Currently this package contains: homed, repart, userdbd, oomd, measure, +Currently this package contains: homed, repart, oomd, measure, pcrphase and ukify. In case you want to create a user with systemd-homed quickly, here are the steps @@ -733,6 +733,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dtpm=%{when_not bootstrap} \ -Dtpm2=%{when_not bootstrap} \ -Dtranslations=%{when_not bootstrap} \ + -Duserdb=%{when_not bootstrap} \ \ -Dcoredump=%{when coredump} \ -Dimportd=%{when importd} \ @@ -760,7 +761,6 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Doomd=%{when experimental} \ -Drepart=%{when experimental} \ -Dsysupdate=%{when experimental} \ - -Duserdb=%{when experimental} \ \ -Dtests=%{when testsuite unsafe} \ -Dinstall-tests=%{when testsuite} @@ -996,6 +996,7 @@ if [ $1 -gt 1 ]; then %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service %systemd_pre systemd-journald-audit.socket + %systemd_pre systemd-userdbd.socket fi %post @@ -1039,6 +1040,7 @@ if [ $1 -gt 1 ]; then %systemd_post getty@.service %systemd_post systemd-timesyncd.service %systemd_post systemd-journald-audit.socket + %systemd_post systemd-userdbd.socket fi # Run the hacks/fixups to clean up old garbages left by (very) old versions of @@ -1046,9 +1048,10 @@ fi %{_systemd_util_dir}/rpm/fixlet-systemd-post.sh $1 || : %postun +# Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service -# Avoid restarting logind until fixed upstream (issue #1163) +%systemd_postun_with_restart systemd-userdbd.service %pre -n udev%{?mini} # Units listed below can be enabled at installation accoding to their preset @@ -1224,23 +1227,19 @@ fi %pre experimental %systemd_pre systemd-homed.service %systemd_pre systemd-oomd.service systemd-oomd.socket -%systemd_pre systemd-userdbd.service systemd-userdbd.socket %post experimental %sysusers_create systemd-oom.conf %systemd_post systemd-homed.service %systemd_post systemd-oomd.service systemd-oomd.socket -%systemd_post systemd-userdbd.service systemd-userdbd.socket %preun experimental %systemd_preun systemd-homed.service %systemd_preun systemd-oomd.service systemd-oomd.socket -%systemd_preun systemd-userdbd.service systemd-userdbd.socket %postun experimental %systemd_postun systemd-homed.service %systemd_postun systemd-oomd.service systemd-oomd.socket -%systemd_postun systemd-userdbd.service systemd-userdbd.socket %endif # File trigger definitions