diff --git a/files.experimental b/files.experimental index dac782d4..f9116e29 100644 --- a/files.experimental +++ b/files.experimental @@ -6,16 +6,10 @@ %dir %{_prefix}/lib/pcrlock.d/500-separator.pcrlock.d %dir %{_prefix}/lib/pcrlock.d/700-action-efi-exit-boot-services.pcrlock.d %dir %{_sysconfdir}/systemd/oomd.conf.d -%dir %{_systemd_util_dir}/repart -%dir %{_systemd_util_dir}/repart/definitions -%dir %{_systemd_util_dir}/repart/definitions/confext.repart.d -%dir %{_systemd_util_dir}/repart/definitions/portable.repart.d -%dir %{_systemd_util_dir}/repart/definitions/sysext.repart.d %if %{with sd_boot} %dir %{_unitdir}/initrd.target.wants %endif %{_bindir}/oomctl -%{_bindir}/systemd-repart %{_bindir}/systemd-vmspawn %if %{with sd_boot} %{_bindir}/ukify @@ -38,7 +32,6 @@ %{_mandir}/man5/oomd.conf.5.gz %{_mandir}/man5/oomd.conf.d.5.gz %{_mandir}/man5/org.freedesktop.oom1.5.gz -%{_mandir}/man5/repart.d.5.gz %{_mandir}/man5/systemd.pcrlock.5.gz %{_mandir}/man5/systemd.pcrlock.d.5.gz %{_mandir}/man5/sysupdate.d.5.gz @@ -65,8 +58,6 @@ %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase.service.8.gz %endif -%{_mandir}/man8/systemd-repart.8.gz -%{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-storagetm.8.gz %{_mandir}/man8/systemd-storagetm.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz @@ -94,17 +85,6 @@ %{_prefix}/lib/pcrlock.d/950-shutdown.pcrlock %{_prefix}/lib/pcrlock.d/990-final.pcrlock %{_systemd_util_dir}/oomd.conf -%{_systemd_util_dir}/repart/definitions/confext.repart.d/10-root.conf -%{_systemd_util_dir}/repart/definitions/confext.repart.d/20-root-verity.conf -%{_systemd_util_dir}/repart/definitions/confext.repart.d/30-root-verity-sig.conf -%{_systemd_util_dir}/repart/definitions/portable.repart.d/10-root.conf -%{_systemd_util_dir}/repart/definitions/portable.repart.d/20-root-verity.conf -%{_systemd_util_dir}/repart/definitions/portable.repart.d/30-root-verity-sig.conf -%{_systemd_util_dir}/repart/definitions/sysext.repart.d/10-root.conf -%{_systemd_util_dir}/repart/definitions/sysext.repart.d/20-root-verity.conf -%{_systemd_util_dir}/repart/definitions/sysext.repart.d/30-root-verity-sig.conf -%{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-bsod %{_systemd_util_dir}/systemd-measure %{_systemd_util_dir}/systemd-oomd @@ -155,7 +135,6 @@ %{_unitdir}/systemd-pcrphase-sysinit.service %{_unitdir}/systemd-pcrphase.service %endif -%{_unitdir}/systemd-repart.service %{_unitdir}/systemd-storagetm.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer diff --git a/files.udev b/files.udev index 3921a1a0..401584d2 100644 --- a/files.udev +++ b/files.udev @@ -22,6 +22,13 @@ %dir %{_sysconfdir}/udev/iocost.conf.d %dir %{_sysconfdir}/udev/rules.d %dir %{_systemd_util_dir}/network +%if %{without bootstrap} +%dir %{_systemd_util_dir}/repart +%dir %{_systemd_util_dir}/repart/definitions +%dir %{_systemd_util_dir}/repart/definitions/confext.repart.d +%dir %{_systemd_util_dir}/repart/definitions/portable.repart.d +%dir %{_systemd_util_dir}/repart/definitions/sysext.repart.d +%endif %dir %{_systemd_util_dir}/system-sleep %dir %{_udevhwdbdir} %dir %{_udevrulesdir} @@ -40,6 +47,9 @@ %{_bindir}/systemd-cryptsetup %endif %{_bindir}/systemd-hwdb +%if %{without bootstrap} +%{_bindir}/systemd-repart +%endif %{_bindir}/udevadm %if %{without bootstrap} %{_datadir}/bash-completion/completions/bootctl @@ -66,6 +76,7 @@ %{_mandir}/man5/modules-load.d.5.gz %{_mandir}/man5/pstore.conf.5.gz %{_mandir}/man5/pstore.conf.d.5.gz +%{_mandir}/man5/repart.d.5.gz %{_mandir}/man5/sleep.conf.d.5.gz %{_mandir}/man5/systemd-sleep.conf.5.gz %{_mandir}/man5/timesyncd.conf.5.gz @@ -117,6 +128,8 @@ %{_mandir}/man8/systemd-random-seed.service.8.gz %{_mandir}/man8/systemd-remount-fs.8.gz %{_mandir}/man8/systemd-remount-fs.service.8.gz +%{_mandir}/man8/systemd-repart.8.gz +%{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-rfkill.8.gz %{_mandir}/man8/systemd-rfkill.service.8.gz %{_mandir}/man8/systemd-rfkill.socket.8.gz @@ -160,7 +173,22 @@ %{_systemd_util_dir}/network/99-default.link %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/pstore.conf +%if %{without bootstrap} +%{_systemd_util_dir}/repart/definitions/confext.repart.d/10-root.conf +%{_systemd_util_dir}/repart/definitions/confext.repart.d/20-root-verity.conf +%{_systemd_util_dir}/repart/definitions/confext.repart.d/30-root-verity-sig.conf +%{_systemd_util_dir}/repart/definitions/portable.repart.d/10-root.conf +%{_systemd_util_dir}/repart/definitions/portable.repart.d/20-root-verity.conf +%{_systemd_util_dir}/repart/definitions/portable.repart.d/30-root-verity-sig.conf +%{_systemd_util_dir}/repart/definitions/sysext.repart.d/10-root.conf +%{_systemd_util_dir}/repart/definitions/sysext.repart.d/20-root-verity.conf +%{_systemd_util_dir}/repart/definitions/sysext.repart.d/30-root-verity-sig.conf +%endif %{_systemd_util_dir}/sleep.conf +%if %{without bootstrap} +%{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service +%endif %{_systemd_util_dir}/systemd-backlight %{_systemd_util_dir}/systemd-battery-check %if %{without bootstrap} @@ -341,6 +369,9 @@ %endif %{_unitdir}/systemd-random-seed.service %{_unitdir}/systemd-remount-fs.service +%if %{without bootstrap} +%{_unitdir}/systemd-repart.service +%endif %{_unitdir}/systemd-rfkill.service %{_unitdir}/systemd-rfkill.socket %{_unitdir}/systemd-suspend-then-hibernate.service diff --git a/systemd.changes b/systemd.changes index 4f511f24..6d4b7de1 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 3 07:03:59 UTC 2024 - Franck Bui + +- Move systemd-repart from experimental to udev. + ------------------------------------------------------------------- Fri Mar 22 11:28:59 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c7a1316f..6798adfb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -342,6 +342,8 @@ Requires(postun):coreutils # 'regenerate_initrd_post' macro is expanded during build, hence this BR. BuildRequires: suse-module-tools %if %{without bootstrap} +# fdisk is a build requirement for repart +BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libkmod) >= 15 # Enable fido2 and tpm supports in systemd-cryptsetup, systemd-enroll. However @@ -701,8 +703,6 @@ Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires -# fdisk is a build requirement for repart -BuildRequires: pkgconfig(fdisk) %description experimental This package contains optional extra services that are considered as previews @@ -717,7 +717,8 @@ 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: repart, oomd, measure, pcrphase and ukify. +Currently this package contains: bsod, oomd, measure, pcrextend, pcrlock, +storagetm, sysupdate, tpm2-setup, userwork and ukify. Have fun (at your own risk). %endif @@ -820,6 +821,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dpasswdqc=%{when_not bootstrap} \ -Dpwquality=%{when_not bootstrap} \ -Dseccomp=%{when_not bootstrap} \ + -Drepart=%{when_not bootstrap} \ -Dstoragetm=%{when_not bootstrap} \ -Dtpm=%{when_not bootstrap} \ -Dtpm2=%{when_not bootstrap} \ @@ -855,7 +857,6 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Dresolve=%{when resolved} \ \ -Doomd=%{when experimental} \ - -Drepart=%{when experimental} \ -Dsysupdate=%{when experimental} \ %if %{with sd_boot} -Dukify=%{when experimental} \