Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2026-04-26 21:11:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Sun Apr 26 21:11:15 2026 rev:467 rq:1348897 version:260.1 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2026-03-14 22:21:39.215288055 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new.11940/systemd.changes 2026-04-26 21:12:59.701543975 +0200 @@ -1,0 +2,29 @@ +Tue Mar 17 16:18:41 UTC 2026 - Franck Bui <[email protected]> + +- Upgrade to v260.1 (commit c0a5a2516d28601fb3afc1a77d7b42fcfe38fced) + + See https://github.com/openSUSE/systemd/blob/SUSE/v260/NEWS for details. + + - Drop support for System V service scripts. + + - Drop 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + - Drop 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch + + - Required versions of various library dependencies have been raised. + + - systemd-update-helper: switch to the new command 'enqueue-marked'. + + - Restore [email protected] alias (a fallout from upstream commit + 072e72424b2e6da1c96489ef6996f49fabd46474) + +------------------------------------------------------------------- +Tue Mar 17 16:02:55 UTC 2026 - Franck Bui <[email protected]> + +- systemd.spec: introduce %{container} bcond for container subpackage + +------------------------------------------------------------------- +Sat Mar 14 13:45:18 UTC 2026 - JS <[email protected]> + +- Enable systemd-boot on loongarch64. + +------------------------------------------------------------------- @@ -8,0 +38,4 @@ + This update includes the following fix: + + 3513862eab udev: check for invalid chars in various fields received from the kernel (bsc#1259697) + @@ -33,0 +67,6 @@ + This update includes the following fixes: + + 497d017241 machined: reject invalid class types when registering machines (bsc#1259650 CVE-2026-4105) + 6566dc1451 nspawn: normalize pivot_root paths (bsc#1261400) + 718711ed87 nspawn: apply BindUser/Ephemeral from settings file only if trusted (bsc#1261400) + @@ -73,0 +113,5 @@ + + This upgrade includes the following fixes: + + 36afb086a1 core: validate ref_uid before checking in AttachProcesses method (bsc#1259987) + 3cee294fe8 core: validate input cgroup path more prudently (bsc#1259418 CVE-2026-29111) Old: ---- 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch files.devel-doc files.sysvcompat systemd-259.5+suse.6.g58a9b1726d.tar.xz systemd-sysv-install New: ---- systemd-260.1.tar.xz ----------(Old B)---------- Old: - Drop 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - Drop 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch Old: - Drop 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - Drop 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:00.817589574 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:00.817589574 +0200 @@ -31,9 +31,9 @@ %bcond_with obs_service_set_version %if %{without obs_service_set_version} -%define systemd_version 259.5 +%define systemd_version 260.1 %define systemd_release 0 -%define archive_version +suse.6.g58a9b1726d +%define archive_version %{nil} %endif %define _testsuitedir %{_systemd_util_dir}/tests @@ -57,8 +57,9 @@ %global mini -mini %global with_bootstrap 1 %else -%global mini %nil +%global mini %{nil} %bcond_without apparmor +%bcond_without container %bcond_without docs %bcond_without homed %bcond_without importd @@ -67,13 +68,12 @@ %bcond_without networkd %bcond_without portabled %bcond_without resolved -%ifarch %{ix86} x86_64 aarch64 riscv64 +%ifarch %{ix86} x86_64 aarch64 riscv64 loongarch64 %bcond_without sd_boot %else %bcond_with sd_boot %endif %bcond_without selinux -%bcond_without sysvcompat %bcond_without testsuite %endif @@ -89,49 +89,54 @@ %if %{without bootstrap} BuildRequires: bpftool BuildRequires: clang -%if %{with apparmor} -BuildRequires: libapparmor-devel -%endif -BuildRequires: libgcrypt-devel # python is only required for generating systemd.directives.xml -BuildRequires: python3-base -%endif -%if %{with docs} -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt-tools +BuildRequires: python3-base >= 3.9.0 BuildRequires: python3-lxml %endif %if %{without bootstrap} BuildRequires: pkgconfig(audit) +BuildRequires: pkgconfig(blkid) >= 2.37 +%if %{with apparmor} +BuildRequires: pkgconfig(libapparmor) +%endif BuildRequires: pkgconfig(libbpf) +BuildRequires: pkgconfig(libcryptsetup) >= 2.4.0 BuildRequires: pkgconfig(libdw) +BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 +BuildRequires: pkgconfig(libseccomp) >= 2.4.0 %if %{with selinux} BuildRequires: pkgconfig(libselinux) >= 2.1.9 %endif +BuildRequires: pkgconfig(libxcrypt) >= 4.4.0 BuildRequires: pkgconfig(libzstd) %endif BuildRequires: fdupes BuildRequires: gperf -BuildRequires: libacl-devel -BuildRequires: libmount-devel >= 2.27.1 BuildRequires: meson >= 0.53.2 -BuildRequires: pam-devel BuildRequires: python3-Jinja2 +BuildRequires: python3-pefile BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools -BuildRequires: pkgconfig(blkid) >= 2.26 +BuildRequires: pkgconfig(libacl) +BuildRequires: pkgconfig(mount) >= 2.27.1 +BuildRequires: pkgconfig(pam) +%if %{with docs} +BuildRequires: docbook-xsl-stylesheets +BuildRequires: libxslt-tools +BuildRequires: python3-lxml +%endif +%if %{with upstream} # The following packages are only required by the execution of the unit tests -# during the 'check' section. +# during the 'check' section (currently only run for upstream builds). BuildRequires: acl BuildRequires: distribution-release -BuildRequires: python3-pefile BuildRequires: timezone +%endif %if %{with bootstrap} #!BuildIgnore: dbus-service @@ -199,9 +204,6 @@ Source0: systemd-%{version}%{?archive_version}.tar.xz Source1: systemd-rpmlintrc Source3: systemd-update-helper -%if %{with sysvcompat} -Source4: systemd-sysv-install -%endif Source5: tmpfiles-suse.conf Source6: baselibs.conf Source7: triggers.systemd @@ -217,7 +219,6 @@ Source202: files.container Source203: files.networkd Source204: files.devel -Source205: files.sysvcompat Source206: files.uefi-boot Source207: files.experimental Source208: files.resolved @@ -225,8 +226,7 @@ Source210: files.lang Source211: files.journal-remote Source212: files.portable -Source213: files.devel-doc -Source214: files.ukify +Source213: files.ukify # # All changes backported from upstream are tracked by the git repository, which @@ -243,10 +243,6 @@ # %if %{without upstream} Patch: 0001-Drop-or-soften-some-upstream-warnings.patch -%if %{with sysvcompat} -Patch: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch -Patch: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -%endif # The patches listed below are in quarantine. Normally, all changes must be # pushed to upstream first and then cherry-picked into the SUSE git @@ -286,25 +282,6 @@ Development headers and files for libsystemd and libudev libraries for developing and building applications linking to these libraries. -%if %{with sysvcompat} -%package sysvcompat -Summary: SySV and LSB init script support for systemd (deprecated) -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -Provides: systemd-sysvinit = %{version}-%{release} -Obsoletes: systemd-sysvinit < %{version}-%{release} - -%description sysvcompat -This package ships the necessary files that enable minimal SysV and LSB init -scripts support in systemd. It also contains the obsolete SysV init tools -telinit(8) and runlevel(8). You should consider using systemctl(1) instead. - -Unless you have a 3rd party application installed on your system that still -relies on such scripts, this package should not be needed at all. - -Please note that the content of this package is considered as deprecated. -%endif - %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later @@ -364,17 +341,16 @@ %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 -# these tools are not linked against the libs directly but instead are -# dlopen()ed at runtime to avoid hard dependencies. Hence the use of soft -# dependencies. BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(libcryptsetup) >= 2.4.0 BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libkmod) >= 15 +BuildRequires: pkgconfig(p11-kit-1) BuildRequires: pkgconfig(tss2-esys) BuildRequires: pkgconfig(tss2-mu) BuildRequires: pkgconfig(tss2-rc) +# These Recommends because some symbols of these libs are dlopen()ed by +# systemd-cryptsetup, systemd-enroll. Recommends: libarchive13 Recommends: libfido2 Recommends: libtss2-esys0 @@ -456,7 +432,7 @@ [2] https://systemd.io/BOOT_LOADER_INTERFACE/ %endif -%if %{without bootstrap} +%if %{with container} %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later @@ -526,7 +502,7 @@ # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: libidn2 BuildRequires: pkgconfig(libidn2) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl) >= 3.0.0 Obsoletes: nss-resolve < %{version}-%{release} Provides: nss-resolve = %{version}-%{release} Provides: systemd-network:/usr/lib/systemd/systemd-resolved @@ -553,10 +529,10 @@ Requires: %{name} = %{version}-%{release} %systemd_requires BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(libcryptsetup) +BuildRequires: pkgconfig(libcryptsetup) >= 2.4.0 BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(libqrencode) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl) >= 3.0.0 BuildRequires: pkgconfig(pwquality) # These Recommends because some symbols of these libs are dlopen()ed by homed Recommends: libcryptsetup12 @@ -751,15 +727,7 @@ -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ %endif -%if %{without sysvcompat} - -Dsysvinit-path= \ - -Dsysvrcnd-path= \ - -Drc-local= \ -Dcompat-sysv-interfaces=false \ -%else - -Drc-local=/etc/init.d/boot.local \ - -Dcompat-sysv-interfaces=true \ -%endif -Dcreate-log-dirs=false \ -Ddebug-shell=/bin/bash \ \ @@ -827,6 +795,7 @@ -Dmachined=%{when machined} \ -Dman=%{enabled_with docs} \ -Dnetworkd=%{when networkd} \ + -Dnspawn=%{enabled_with container} \ -Dportabled=%{when portabled} \ -Dremote=%{enabled_with journal_remote} \ -Dselinux=%{enabled_with selinux} \ @@ -876,6 +845,9 @@ %ifarch riscv64 export BRP_PESIGN_FILES="%{_systemd_util_dir}/boot/efi/systemd-bootriscv64.efi" %endif +%ifarch loongarch64 +export BRP_PESIGN_FILES="%{_systemd_util_dir}/boot/efi/systemd-bootloongarch64.efi" +%endif %endif # Don't ship resolvconf symlink for now as it conflicts with the binary shipped @@ -886,9 +858,6 @@ %endif install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-update-helper -%if %{with sysvcompat} -install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install -%endif # Install the fixlets mkdir -p %{buildroot}%{_systemd_util_dir}/rpm @@ -910,6 +879,10 @@ # Don't enable wall ask password service, it spams every console (bnc#747783). rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path +# Restore autovt static alias dropped by commit 072e72424b2e6 - [email protected] +# acts as a fallback. +ln -s [email protected] %{buildroot}%{_unitdir}/[email protected] + # do not ship sysctl defaults in systemd package, will be part of aaa_base (in # procps for now). rm -f %{buildroot}%{_sysctldir}/50-default.conf @@ -1044,8 +1017,6 @@ %find_lang systemd %else rm -f %{buildroot}%{_journalcatalogdir}/* -rm -f %{buildroot}%{_bindir}/systemd-nspawn -rm -f %{buildroot}%{_systemd_util_dir}/*/[email protected] %endif %if %{without docs} @@ -1162,7 +1133,7 @@ %ldconfig_scriptlets -n libsystemd0%{?mini} %ldconfig_scriptlets -n libudev%{?mini}1 -%if %{without bootstrap} +%if %{with container} %pre container %systemd_pre systemd-mountfsd.socket %systemd_pre systemd-nsresourced.socket @@ -1310,7 +1281,7 @@ %include %{SOURCE206} %endif -%if %{without bootstrap} +%if %{with container} %files container %include %{SOURCE202} %endif @@ -1329,11 +1300,6 @@ %license LICENSE.LGPL2.1 %include %{SOURCE204} -%if %{with sysvcompat} -%files sysvcompat -%include %{SOURCE205} -%endif - %files -n libsystemd0%{?mini} %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 @@ -1352,7 +1318,7 @@ %if %{with docs} %files doc %{_docdir}/systemd/ -%include %{SOURCE213} +%{_mandir}/man3/*.3%{?ext_man} %endif %files experimental @@ -1381,6 +1347,6 @@ %if %{with sd_boot} %files ukify -%include %{SOURCE214} +%include %{SOURCE213} %endif ++++++ files.container ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:00.921593823 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:00.925593986 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_datadir}/bash-completion/completions/systemd-nspawn @@ -24,10 +31,10 @@ %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.link %{_systemd_util_dir}/network/80-container-vz.network -%{_systemd_util_dir}/network/80-namespace-ns.link -%{_systemd_util_dir}/network/80-namespace-ns.network %{_systemd_util_dir}/network/80-namespace-ns-tun.link %{_systemd_util_dir}/network/80-namespace-ns-tun.network +%{_systemd_util_dir}/network/80-namespace-ns.link +%{_systemd_util_dir}/network/80-namespace-ns.network %endif %{_systemd_util_dir}/systemd-mountfsd %{_systemd_util_dir}/systemd-mountwork @@ -91,9 +98,9 @@ %if %{with docs} %{_mandir}/man1/importctl.1.gz %{_mandir}/man5/org.freedesktop.import1.5.gz +%{_mandir}/man8/systemd-import-generator.8.gz %{_mandir}/man8/systemd-importd.8.gz %{_mandir}/man8/systemd-importd.service.8.gz -%{_mandir}/man8/systemd-import-generator.8.gz %endif %{_systemd_util_dir}/import-pubring.pgp %{_systemd_util_dir}/systemd-export @@ -101,11 +108,11 @@ %{_systemd_util_dir}/systemd-import-fs %{_systemd_util_dir}/systemd-importd %{_systemd_util_dir}/systemd-pull -%{_systemdgeneratordir}/systemd-import-generator %{_systemd_util_dir}/user/dbus-org.freedesktop.import1.service %{_systemd_util_dir}/user/sockets.target.wants/systemd-importd.socket %{_systemd_util_dir}/user/systemd-importd.service %{_systemd_util_dir}/user/systemd-importd.socket +%{_systemdgeneratordir}/systemd-import-generator %{_unitdir}/dbus-org.freedesktop.import1.service %{_unitdir}/sockets.target.wants/systemd-importd.socket %{_unitdir}/systemd-importd.service ++++++ files.devel ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:00.953595130 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:00.961595457 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %{_includedir}/libudev.h %{_includedir}/systemd/ %{_libdir}/libsystemd.so ++++++ files.experimental ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:00.989596601 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:00.993596765 +0200 @@ -1,6 +1,12 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# # the ssh proxy will likely be promoted to systemd-container %dir %{_distconfdir}/ssh @@ -11,6 +17,9 @@ %if %{without bootstrap} %dir %{_sysconfdir}/systemd/oomd.conf.d %endif +%if %{with importd} +%dir %{_systemd_util_dir}/oci-registry +%endif %dir %{_unitdir}/factory-reset.target.wants %if %{with sd_boot} %dir %{_unitdir}/initrd.target.wants @@ -21,9 +30,7 @@ %if %{without bootstrap} %{_bindir}/oomctl %endif -%if %{with upstream} %{_bindir}/systemd-mstack -%endif %{_bindir}/systemd-mute-console %if %{without bootstrap} %{_bindir}/systemd-vmspawn @@ -38,24 +45,27 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.sysupdate1.service %{_datadir}/dbus-1/system.d/org.freedesktop.oom1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.sysupdate1.conf +%if %{with upstream} +%{_datadir}/polkit-1/actions/io.systemd.imds.policy +%endif %{_datadir}/polkit-1/actions/org.freedesktop.sysupdate1.policy %{_datadir}/zsh/site-functions/_oomctl %endif %{_distconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf %if %{with docs} -%if %{with upstream} %{_mandir}/man1/mount.mstack.1.gz -%endif %{_mandir}/man1/oomctl.1.gz +%if %{with upstream} +%{_mandir}/man1/systemd-imds-import.service.1.gz +%{_mandir}/man1/systemd-imds.1.gz +%endif %{_mandir}/man1/systemd-keyutil.1.gz %{_mandir}/man1/systemd-measure.1.gz +%{_mandir}/man1/systemd-mstack.1.gz %{_mandir}/man1/systemd-mute-console.1.gz %{_mandir}/man1/systemd-mute-console.socket.1.gz %{_mandir}/man1/[email protected] -%if %{with upstream} -%{_mandir}/man1/systemd-mstack.1.gz %{_mandir}/man1/systemd-report.1.gz -%endif %{_mandir}/man1/systemd-sbsign.1.gz %{_mandir}/man1/systemd-ssh-issue.1.gz %{_mandir}/man1/systemd-ssh-proxy.1.gz @@ -67,9 +77,7 @@ %{_mandir}/man5/org.freedesktop.sysupdate1.5.gz %{_mandir}/man5/sysupdate.d.5.gz %{_mandir}/man5/sysupdate.features.5.gz -%if %{with upstream} %{_mandir}/man7/systemd.mstack.7.gz -%endif %{_mandir}/man8/systemd-bsod.8.gz %{_mandir}/man8/systemd-bsod.service.8.gz %{_mandir}/man8/systemd-factory-reset-complete.service.8.gz @@ -78,6 +86,13 @@ %{_mandir}/man8/systemd-factory-reset.8.gz %{_mandir}/man8/systemd-factory-reset.socket.8.gz %{_mandir}/man8/[email protected] +%if %{with upstream} +%{_mandir}/man8/systemd-imds-generator.8.gz +%{_mandir}/man8/systemd-imdsd-early-network.service.8.gz +%{_mandir}/man8/systemd-imdsd.8.gz +%{_mandir}/man8/systemd-imdsd.socket.8.gz +%{_mandir}/man8/[email protected] +%endif %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz %if %{with sd_boot} @@ -93,6 +108,11 @@ %{_mandir}/man8/systemd-pcrlock-secureboot-policy.service.8.gz %{_mandir}/man8/systemd-pcrmachine.service.8.gz %{_mandir}/man8/systemd-pcrnvdone.service.8.gz +%endif +%if %{with upstream} +%{_mandir}/man8/systemd-pcrosseparator.service.8.gz +%endif +%if %{with sd_boot} %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase.service.8.gz @@ -115,17 +135,22 @@ %{_mandir}/man8/systemd-tpm2-setup.8.gz %{_mandir}/man8/systemd-tpm2-setup.service.8.gz %endif +%if %{with upstream} +%{_mandir}/man8/systemd-tpm2-swtpm.8.gz +%{_mandir}/man8/systemd-tpm2-swtpm.service.8.gz +%endif %{_mandir}/man8/[email protected] %endif %if %{with sd_boot} %{_prefix}/lib/nvpcr/cryptsetup.nvpcr %{_prefix}/lib/nvpcr/hardware.nvpcr -%if %{with upstream} %{_prefix}/lib/nvpcr/verity.nvpcr +%if %{with upstream} +%{_prefix}/lib/pcrlock.d/750-os-separator.pcrlock %endif %endif -%if %{with upstream} %{_sbindir}/mount.mstack +%if %{with importd} %{_systemd_util_dir}/oci-registry/default.oci-registry %{_systemd_util_dir}/oci-registry/image.alpine.oci-registry %{_systemd_util_dir}/oci-registry/image.archlinux.oci-registry @@ -142,15 +167,23 @@ %endif %{_systemd_util_dir}/systemd-factory-reset %if %{without bootstrap} +%if %{with upstream} +%{_systemd_util_dir}/systemd-imds +%{_systemd_util_dir}/systemd-imdsd +%endif %{_systemd_util_dir}/systemd-keyutil %{_systemd_util_dir}/systemd-measure %{_systemd_util_dir}/systemd-oomd +%endif %if %{with sd_boot} %{_systemd_util_dir}/systemd-pcrextend %endif -%if %{with upstream} %{_systemd_util_dir}/systemd-report +%if %{with upstream} +%{_systemd_util_dir}/systemd-report-basic +%{_systemd_util_dir}/systemd-report-cgroup %endif +%if %{without bootstrap} %{_systemd_util_dir}/systemd-sbsign %endif %{_systemd_util_dir}/systemd-ssh-issue @@ -159,9 +192,12 @@ %{_systemd_util_dir}/systemd-storagetm %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-sysupdated +%endif %if %{with sd_boot} %{_systemd_util_dir}/systemd-tpm2-clear %{_systemd_util_dir}/systemd-tpm2-setup +%if %{with upstream} +%{_systemd_util_dir}/systemd-tpm2-swtpm %endif %endif %{_systemd_util_dir}/systemd-validatefs @@ -169,47 +205,61 @@ %{_systemd_util_dir}/user/[email protected] %endif %{_systemdgeneratordir}/systemd-factory-reset-generator +%if %{without bootstrap} +%if %{with upstream} +%{_systemdgeneratordir}/systemd-imds-generator +%endif +%endif # ssh-generator: in the futur to be moved to the main package %{_systemdgeneratordir}/systemd-ssh-generator %if %{with sd_boot} %{_systemdgeneratordir}/systemd-tpm2-generator +%if %{with upstream} +%{_sysusersdir}/systemd-imds.conf +%endif %endif %if %{without bootstrap} %{_sysusersdir}/systemd-oom.conf +%endif +%if %{with upstream} +%{_udevhwdbdir}/40-imds.hwdb +%endif +%if %{without bootstrap} %{_unitdir}/dbus-org.freedesktop.sysupdate1.service %endif %{_unitdir}/factory-reset-now.target %{_unitdir}/factory-reset.target.wants/systemd-factory-reset-request.service -%if %{without bootstrap} %if %{with sd_boot} %{_unitdir}/factory-reset.target.wants/systemd-pcrphase-factory-reset.service %endif +%if %{without bootstrap} %{_unitdir}/initrd.target.wants/systemd-bsod.service +%endif %if %{with sd_boot} %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service %endif -%endif %{_unitdir}/sockets.target.wants/systemd-factory-reset.socket -%if %{with upstream} %{_unitdir}/sockets.target.wants/systemd-journalctl.socket -%endif %{_unitdir}/sockets.target.wants/systemd-mute-console.socket -%if %{without bootstrap} %if %{with sd_boot} %{_unitdir}/sockets.target.wants/systemd-pcrextend.socket %endif +%if %{without bootstrap} %{_unitdir}/storage-target-mode.target +%endif %if %{with sd_boot} %{_unitdir}/storage-target-mode.target.wants/systemd-pcrphase-storage-target-mode.service %{_unitdir}/sysinit.target.wants/systemd-pcrmachine.service %{_unitdir}/sysinit.target.wants/systemd-pcrnvdone.service +%if %{with upstream} +%{_unitdir}/sysinit.target.wants/systemd-pcrosseparator.service +%endif %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service %{_unitdir}/sysinit.target.wants/systemd-pcrproduct.service %{_unitdir}/sysinit.target.wants/systemd-tpm2-setup-early.service %{_unitdir}/sysinit.target.wants/systemd-tpm2-setup.service %endif -%endif %{_unitdir}/system-systemd\x2dmute\x2dconsole.slice %if %{without bootstrap} %{_unitdir}/systemd-bsod.service @@ -220,17 +270,24 @@ %{_unitdir}/systemd-factory-reset.socket %{_unitdir}/[email protected] %if %{with upstream} +%if %{without bootstrap} +%{_unitdir}/systemd-imds-early-network.service +%{_unitdir}/systemd-imds-import.service +%{_unitdir}/systemd-imdsd.socket +%{_unitdir}/[email protected] +%endif +%endif %{_unitdir}/systemd-journalctl.socket %{_unitdir}/[email protected] -%endif %{_unitdir}/systemd-mute-console.socket %{_unitdir}/[email protected] -%if %{with upstream} +%if %{with networkd} %{_unitdir}/systemd-networkd-varlink-metrics.socket %endif %if %{without bootstrap} %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket +%endif %if %{with sd_boot} %{_unitdir}/systemd-pcrextend.socket %{_unitdir}/[email protected] @@ -253,26 +310,34 @@ %{_unitdir}/systemd-pcrphase.service %{_unitdir}/systemd-pcrproduct.service %endif +%if %{with upstream} +%{_unitdir}/systemd-report-basic.socket +%{_unitdir}/[email protected] +%{_unitdir}/systemd-report-cgroup.socket +%{_unitdir}/[email protected] +%endif +%if %{without bootstrap} %{_unitdir}/systemd-storagetm.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer %{_unitdir}/systemd-sysupdate.service %{_unitdir}/systemd-sysupdate.timer %{_unitdir}/systemd-sysupdated.service +%endif %if %{with sd_boot} %{_unitdir}/systemd-tpm2-clear.service %{_unitdir}/systemd-tpm2-setup-early.service %{_unitdir}/systemd-tpm2-setup.service +%if %{with upstream} +%{_unitdir}/systemd-tpm2-swtpm.service %endif %endif %{_unitdir}/[email protected] %if %{without bootstrap} %{_unitdir}/[email protected] %endif -%if %{with upstream} %{_userunitdir}/sockets.target.wants/systemd-journalctl.socket %{_userunitdir}/systemd-journalctl.socket %{_userunitdir}/[email protected] -%endif /usr/etc/profile.d/80-systemd-osc-context.sh ++++++ files.homed ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.021597909 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.029598236 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_distconfdir}/ssh %dir %{_distconfdir}/ssh/sshd_config.d %{_bindir}/homectl ++++++ files.journal-remote ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.057599380 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.061599544 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_datadir}/systemd/gatewayd %dir %{_sysconfdir}/systemd/journal-remote.conf.d %dir %{_sysconfdir}/systemd/journal-upload.conf.d ++++++ files.lang ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.085600524 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.097601014 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %lang(be) %{_journalcatalogdir}/systemd.be.catalog %lang(be@latin) %{_journalcatalogdir}/[email protected] %lang(bg) %{_journalcatalogdir}/systemd.bg.catalog ++++++ files.networkd ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.125602159 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.129602322 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/systemd/networkd.conf.d %dir %{_systemd_util_dir}/network ++++++ files.portable ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.157603466 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.165603793 +0200 @@ -1,13 +1,18 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %{_bindir}/portablectl %{_datadir}/bash-completion/completions/portablectl -%if %{with upstream} -%{_datadir}/dbus-1/services/org.freedesktop.portable1.service -%endif %{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml +%{_datadir}/dbus-1/services/org.freedesktop.portable1.service %{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service %{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf %{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy @@ -18,12 +23,10 @@ %{_mandir}/man8/systemd-portabled.service.8.gz %endif %{_systemd_util_dir}/portable -%if %{with upstream} +%{_systemd_util_dir}/systemd-portabled %{_systemd_util_dir}/user/dbus-org.freedesktop.portable1.service %{_systemd_util_dir}/user/portable %{_systemd_util_dir}/user/systemd-portabled.service -%endif -%{_systemd_util_dir}/systemd-portabled %{_tmpfilesdir}/portables.conf %{_unitdir}/dbus-org.freedesktop.portable1.service %{_unitdir}/systemd-portabled.service ++++++ files.resolved ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.193604937 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.197605100 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_sysconfdir}/systemd/resolved.conf.d %{_bindir}/resolvectl %{_bindir}/systemd-resolve @@ -21,6 +28,9 @@ %{_mandir}/man5/resolved.conf.5.gz %{_mandir}/man5/resolved.conf.d.5.gz %{_mandir}/man5/systemd.dns-delegate.5.gz +%if %{with upstream} +%{_mandir}/man5/systemd.rr.5.gz +%endif %{_mandir}/man8/libnss_resolve.so.2.8.gz %{_mandir}/man8/nss-resolve.8.gz %{_mandir}/man8/systemd-resolved.8.gz ++++++ files.systemd ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.229606408 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.233606571 +0200 @@ -1,6 +1,12 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# %dir %{_binfmtdir} %if %{without bootstrap} @@ -14,9 +20,7 @@ %dir %{_datadir}/dbus-1/system.d %dir %{_datadir}/factory %dir %{_datadir}/systemd -%if %{with upstream} %dir %{_datadir}/user-tmpfiles.d -%endif %if %{without bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions @@ -24,9 +28,6 @@ %dir %{_environmentdir} %dir %{_journalcatalogdir} %dir %{_libdir}/systemd -%if %{without upstream} -%dir %{_localstatedir}/lib/systemd -%endif %dir %{_modprobedir} %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/binfmt.d @@ -76,7 +77,7 @@ %dir %{_unitdir}/shutdown.target.wants %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants -%if %{with upstream} +%if %{without bootstrap} %dir %{_unitdir}/system-update-pre.target.wants %endif %dir %{_unitdir}/timers.target.wants @@ -211,9 +212,7 @@ %{_datadir}/pkgconfig/systemd.pc %{_datadir}/polkit-1/actions/io.systemd.ask-password.policy %{_datadir}/polkit-1/actions/io.systemd.credentials.policy -%if %{with upstream} %{_datadir}/polkit-1/actions/io.systemd.sysext.policy -%endif %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy @@ -223,9 +222,7 @@ %{_datadir}/polkit-1/rules.d/empower.rules %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if %{with upstream} %{_datadir}/user-tmpfiles.d/20-systemd-varlink.conf -%endif %if %{without bootstrap} %{_datadir}/zsh/site-functions/_busctl %{_datadir}/zsh/site-functions/_coredumpctl @@ -396,6 +393,9 @@ %{_mandir}/man8/systemd-boot-check-no-failures.8.gz %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz %{_mandir}/man8/systemd-confext-initrd.service.8.gz +%if %{with upstream} +%{_mandir}/man8/systemd-confext-sysroot.service.8.gz +%endif %{_mandir}/man8/systemd-confext.8.gz %{_mandir}/man8/systemd-confext.service.8.gz %{_mandir}/man8/systemd-coredump.8.gz @@ -432,6 +432,9 @@ %{_mandir}/man8/systemd-sysctl.8.gz %{_mandir}/man8/systemd-sysctl.service.8.gz %{_mandir}/man8/systemd-sysext-initrd.service.8.gz +%if %{with upstream} +%{_mandir}/man8/systemd-sysext-sysroot.service.8.gz +%endif %{_mandir}/man8/systemd-sysext.8.gz %{_mandir}/man8/systemd-sysext.service.8.gz %{_mandir}/man8/systemd-system-update-generator.8.gz @@ -447,10 +450,6 @@ %{_mandir}/man8/systemd-tmpfiles.8.gz %{_mandir}/man8/systemd-update-done.8.gz %{_mandir}/man8/systemd-update-done.service.8.gz -%if %{with utmp} -%{_mandir}/man8/systemd-update-utmp.8.gz -%{_mandir}/man8/systemd-update-utmp.service.8.gz -%endif %{_mandir}/man8/systemd-user-sessions.8.gz %{_mandir}/man8/systemd-user-sessions.service.8.gz %{_mandir}/man8/systemd-userdbd.8.gz @@ -504,9 +503,6 @@ %{_systemd_util_dir}/systemd-timedated %{_systemd_util_dir}/systemd-update-done %{_systemd_util_dir}/systemd-update-helper -%if %{with utmp} -%{_systemd_util_dir}/systemd-update-utmp -%endif %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %if %{without bootstrap} @@ -553,12 +549,13 @@ %if %{with sd_boot} %{_tmpfilesdir}/20-systemd-stub.conf %endif -%if %{with upstream} %{_tmpfilesdir}/20-systemd-varlink.conf -%endif %{_tmpfilesdir}/credstore.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/provision.conf +%if %{with upstream} +%{_tmpfilesdir}/root.conf +%endif %{_tmpfilesdir}/systemd-nologin.conf %{_tmpfilesdir}/systemd-suse.conf %{_tmpfilesdir}/systemd-tmp.conf @@ -568,9 +565,7 @@ %{_udevrulesdir}/71-seat.rules %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules -%if %{without upstream} %{_unitdir}/[email protected] -%endif %{_unitdir}/basic.target %{_unitdir}/[email protected] %{_unitdir}/bluetooth.target @@ -689,13 +684,10 @@ %{_unitdir}/sysinit.target.wants/systemd-sysusers.service %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service -%if %{with utmp} -%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%endif %{_unitdir}/syslog.socket %{_unitdir}/system-update-cleanup.service %{_unitdir}/system-update-pre.target -%if %{with upstream} +%if %{without bootstrap} %{_unitdir}/system-update-pre.target.wants/systemd-coredump.socket %endif %{_unitdir}/system-update.target @@ -708,6 +700,9 @@ %{_unitdir}/systemd-binfmt.service %{_unitdir}/systemd-boot-check-no-failures.service %{_unitdir}/systemd-confext-initrd.service +%if %{with upstream} +%{_unitdir}/systemd-confext-sysroot.service +%endif %{_unitdir}/systemd-confext.service %if %{without bootstrap} %{_unitdir}/systemd-coredump.socket @@ -740,6 +735,9 @@ %{_unitdir}/systemd-soft-reboot.service %{_unitdir}/systemd-sysctl.service %{_unitdir}/systemd-sysext-initrd.service +%if %{with upstream} +%{_unitdir}/systemd-sysext-sysroot.service +%endif %{_unitdir}/systemd-sysext.service %{_unitdir}/systemd-sysext.socket %{_unitdir}/[email protected] @@ -750,9 +748,6 @@ %{_unitdir}/systemd-tmpfiles-clean.timer %{_unitdir}/systemd-tmpfiles-setup.service %{_unitdir}/systemd-update-done.service -%if %{with utmp} -%{_unitdir}/systemd-update-utmp.service -%endif %{_unitdir}/systemd-user-sessions.service %if %{without bootstrap} %{_unitdir}/systemd-userdb-load-credentials.service ++++++ files.udev ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.273608205 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.281608532 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %if %{without bootstrap} %dir %{_libdir}/cryptsetup %endif @@ -39,7 +46,6 @@ %dir %{_unitdir}/initrd.target.wants %doc %{_udevhwdbdir}/README %doc %{_udevrulesdir}/README -%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf @@ -63,6 +69,9 @@ %{_datadir}/bash-completion/completions/bootctl %{_datadir}/bash-completion/completions/kernel-install %{_datadir}/bash-completion/completions/systemd-cryptenroll +%if %{with upstream} +%{_datadir}/bash-completion/completions/systemd-hwdb +%endif %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service @@ -72,6 +81,9 @@ %if %{without bootstrap} %{_datadir}/zsh/site-functions/_bootctl %{_datadir}/zsh/site-functions/_kernel-install +%if %{with upstream} +%{_datadir}/zsh/site-functions/_systemd-hwdb +%endif %{_datadir}/zsh/site-functions/_udevadm %{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so %{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so @@ -304,17 +316,13 @@ %{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb -%if %{with upstream} %{_udevhwdbdir}/60-tpm2.hwdb -%endif %{_udevhwdbdir}/70-analyzers.hwdb %{_udevhwdbdir}/70-av-production.hwdb %{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-hardware-wallets.hwdb %{_udevhwdbdir}/70-joystick.hwdb -%if %{with upstream} %{_udevhwdbdir}/70-lights.hwdb -%endif %{_udevhwdbdir}/70-maker-tools.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pda.hwdb @@ -344,13 +352,9 @@ %{_udevrulesdir}/60-persistent-v4l.rules %{_udevrulesdir}/60-sensor.rules %{_udevrulesdir}/60-serial.rules -%if %{with upstream} %{_udevrulesdir}/60-tpm2-id.rules -%endif %{_udevrulesdir}/64-btrfs.rules -%if %{with upstream} %{_udevrulesdir}/65-integration.rules -%endif %{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips riscv64 loongarch64 ++++++ files.uefi-boot ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.305609513 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.313609840 +0200 @@ -1,6 +1,13 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_systemd_util_dir}/boot %dir %{_systemd_util_dir}/boot/efi %if %{with docs} ++++++ files.ukify ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.337610820 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.341610984 +0200 @@ -1,17 +1,20 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # -%if %{with upstream} +# Nesting rules for conditional scopes: +# - Max nesting depth is 2. +# - 'docs' and 'upstream' scopes may contain nested conditionals. +# - 'upstream' scopes may be nested inside any conditional. +# - All other nesting is disallowed. +# + %dir %{_systemd_util_dir}/boot/hwids/ -%endif %{_bindir}/ukify %if %{with docs} %{_mandir}/man1/ukify.1.gz %endif %{_prefix}/lib/kernel/install.d/60-ukify.install %{_prefix}/lib/kernel/uki.conf -%if %{with upstream} %{_systemd_util_dir}/boot/hwids/ -%endif %{_systemd_util_dir}/ukify ++++++ systemd-259.5+suse.6.g58a9b1726d.tar.xz -> systemd-260.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/systemd/systemd-259.5+suse.6.g58a9b1726d.tar.xz /work/SRC/openSUSE:Factory/.systemd.new.11940/systemd-260.1.tar.xz differ: char 15, line 1 ++++++ systemd-update-helper ++++++ --- /var/tmp/diff_new_pack.rbcUD2/_old 2026-04-26 21:13:01.453615560 +0200 +++ /var/tmp/diff_new_pack.rbcUD2/_new 2026-04-26 21:13:01.457615724 +0200 @@ -175,7 +175,7 @@ fi if [[ "$command" =~ restart ]]; then - systemctl reload-or-restart --marked + systemctl enqueue-marked fi ;; @@ -196,7 +196,7 @@ for user in $users; do SYSTEMD_BUS_TIMEOUT=${UPDATE_HELPER_USER_TIMEOUT_SEC}s \ - systemctl --user -M "$user@" reload-or-restart --marked & + systemctl --user -M "$user@" enqueue-marked & done wait fi
