Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2022-03-28 16:58:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Mon Mar 28 16:58:41 2022 rev:354 rq:964674 version:250.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2022-03-19
11:56:43.578780053 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new.1900/systemd.changes
2022-03-28 16:59:10.280856089 +0200
@@ -1,0 +2,75 @@
+Wed Mar 23 15:17:40 UTC 2022 - Franck Bui <f...@suse.com>
+
+- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE
+
+-------------------------------------------------------------------
+Thu Mar 17 10:38:16 UTC 2022 - Franck Bui <f...@suse.com>
+
+- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
+
+ A temporary workaround until bsc#1197178 is resolved.
+
+-------------------------------------------------------------------
+Wed Mar 16 20:50:35 UTC 2022 - Franck Bui <f...@suse.com>
+
+- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4)
+
+ For a complete list of changes, visit:
+
https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65
+
+-------------------------------------------------------------------
+Wed Mar 16 20:36:36 UTC 2022 - Franck Bui <f...@suse.com>
+
+- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a
+
+ 37b683c832 journal: preserve acls when rotating user journals with NOCOW
attribute set
+ d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd
+ 78c2766689 journal-file: explicitly handle file systems that do not support
hole punching
+ 7ecfb4b098 journal-file: fix error handling of pread() in
journald_file_punch_holes()
+ c4946a412c journal-file: don't use pread() when determining where to append,
use mmap as before
+ d3fbd20628 journal: various fixes to journal_file_read_object()
+ 5897a8e8d4 shared: Handle filesystems that don't support hole punching in
COPY_HOLES
+ 27746408e2 journal: Truncate file instead of punching hole in final object
+ 59b6130030 shared: Ensure COPY_HOLES copies trailing holes
+ ac9ccba73f journal: stat journal file after truncating
+ 0257283444 journal: Copy holes when archiving BTRFS journal files
+ 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full()
+ 6c7191dece copy: fix wrong argument passed to S_ISREG() in
copy_file_fd_full()
+ af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device
ID (bsc#1195529)
+
+-------------------------------------------------------------------
+Sat Mar 12 12:57:26 UTC 2022 - Callum Farmer <gm...@opensuse.org>
+
+- Update Supplements to new format in baselibs.conf
+- Fix libsystemd-shared exclusion in baselibs.conf
+- Exclude new cryptsetup libraries in baselibs.conf
+
+-------------------------------------------------------------------
+Tue Mar 8 19:08:03 UTC 2022 - Franck Bui <f...@suse.com>
+
+- systemd.spec: minor simplification by assuming that %{bootstrap} is always
+ defined.
+
+-------------------------------------------------------------------
+Tue Mar 8 17:50:57 UTC 2022 - Franck Bui <f...@suse.com>
+
+- Make sure to create 'systemd-coredump' system user when systemd-coredump is
+ installed (follow-up for the split of the sysusers config files).
+
+-------------------------------------------------------------------
+Tue Mar 8 09:41:42 UTC 2022 - Franck Bui <f...@suse.com>
+
+- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01)
+
+ See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for
+ details.
+
+ * Rebased 0001-conf-parser-introduce-early-drop-ins.patch
+ 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
+
+- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
+
+ The alias makes little sense as soon as multiple network managers are used in
+ parallel.
+
+-------------------------------------------------------------------
Old:
----
0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
systemd-v249.10+suse.86.g0bb1977021.tar.xz
New:
----
1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
systemd-v250.4+suse.35.g8ef8dfd540.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.316857496 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.320857502 +0200
@@ -27,7 +27,7 @@
%endif
%define min_kernel_version 4.5
-%define suse_version +suse.86.g0bb1977021
+%define suse_version +suse.35.g8ef8dfd540
%define _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@@ -37,7 +37,7 @@
%define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}}
%define when() %{expand:%%__when_%# %{*}}
-%if 0%{?bootstrap}
+%if %{bootstrap}
%bcond_with coredump
%bcond_with importd
%bcond_with journal_remote
@@ -71,12 +71,12 @@
Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd
-Version: 249.10
+Version: 250.4
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
BuildRequires: docbook-xsl-stylesheets
BuildRequires: kbd
BuildRequires: libapparmor-devel
@@ -132,7 +132,7 @@
BuildRequires: gnu-efi
%endif
-%if 0%{?bootstrap}
+%if %{bootstrap}
#!BuildIgnore: dbus-1
Provides: systemd = %{version}-%{release}
Conflicts: systemd
@@ -215,12 +215,16 @@
Patch2: 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
Patch3: 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch
Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch
-Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch
+%if %{with sysvcompat}
Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch
+%endif
Patch10: 0001-conf-parser-introduce-early-drop-ins.patch
Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch
Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch
+# Temporary workaround until bsc#1197178 is addressed.
+Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
+
# Patches listed below are put in quarantine. Normally all changes
# must go to upstream first and then are cherry-picked in the SUSE git
# repository. But in very few cases, some stuff might be broken in
@@ -241,7 +245,7 @@
%package doc
Summary: HTML documentation for systemd
License: LGPL-2.1-or-later
-%if 0%{?bootstrap}
+%if %{bootstrap}
Conflicts: systemd-doc
Requires: this-is-only-for-build-envs
%else
@@ -259,7 +263,7 @@
Requires: systemd-rpm-macros
Provides: libudev%{?mini}-devel = %{version}-%{release}
Obsoletes: libudev%{?mini}-devel < %{version}-%{release}
-%if 0%{?bootstrap}
+%if %{bootstrap}
Provides: systemd-devel = %{version}-%{release}
Conflicts: systemd-devel
Provides: libudev-devel = %{version}-%{release}
@@ -292,7 +296,7 @@
%package -n libsystemd0%{?mini}
Summary: Component library for systemd
License: LGPL-2.1-or-later
-%if 0%{?bootstrap}
+%if %{bootstrap}
Conflicts: kiwi
Conflicts: libsystemd0
Provides: libsystemd0 = %{version}-%{release}
@@ -338,7 +342,7 @@
Conflicts: filesystem < 11.5
Conflicts: mkinitrd < 2.7.0
Conflicts: util-linux < 2.16
-%if 0%{?bootstrap}
+%if %{bootstrap}
Conflicts: udev
Provides: udev = %{version}-%{release}
%endif
@@ -353,7 +357,7 @@
%package -n libudev%{?mini}1
Summary: Dynamic library to access udev device information
License: LGPL-2.1-or-later
-%if 0%{?bootstrap}
+%if %{bootstrap}
Conflicts: kiwi
Conflicts: libudev1
Provides: libudev1 = %{version}-%{release}
@@ -387,7 +391,7 @@
Provides: nss-mymachines = %{version}-%{release}
Provides: systemd-container = %{version}-%{release}
Provides: systemd:%{_bindir}/systemd-nspawn
-%if 0%{?bootstrap}
+%if %{bootstrap}
Conflicts: systemd-container
Provides: systemd-container = %{version}-%{release}
%endif
@@ -458,7 +462,7 @@
https://systemd.io/PORTABLE_SERVICES
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%package -n nss-systemd
Summary: Plugin for local virtual host name resolution
License: LGPL-2.1-or-later
@@ -625,7 +629,7 @@
Have fun with these services at your own risk.
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%lang_package
%endif
@@ -670,7 +674,7 @@
-Dima=false \
-Delfutils=auto \
-Doomd=false \
-%if 0%{?bootstrap}
+%if %{bootstrap}
-Dbashcompletiondir=no \
-Dzshcompletiondir=no \
-Dtranslations=false \
@@ -690,6 +694,7 @@
\
-Defi=%{when sd_boot} \
-Dgnu-efi=%{when sd_boot} \
+ -Dsbat-distro= \
\
-Dresolve=%{when resolved} \
-Ddns-servers='' \
@@ -759,6 +764,11 @@
# Replace upstream systemd-user with the openSUSE one.
install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2}
+# kmod keeps insisting on using /lib on SLE.
+if [ "%{_modprobedir}" != /usr/lib/modprobe.d ]; then
+ mv %{buildroot}/usr/lib/modprobe.d %{buildroot}%{_modprobedir}
+fi
+
# 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
@@ -913,7 +923,7 @@
find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \;
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%find_lang systemd
%endif
@@ -942,7 +952,7 @@
chmod 444 %{_sysconfdir}/machine-id
fi
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
pam-config --add --systemd || :
%endif
@@ -1125,7 +1135,12 @@
%ldconfig
%endif
-%if ! 0%{?bootstrap}
+%if %{with coredump}
+%post coredump
+%sysusers_create systemd-coredump.conf
+%endif
+
+%if ! %{bootstrap}
%ldconfig_scriptlets -n nss-myhostname
%ldconfig_scriptlets -n nss-systemd
%endif
@@ -1270,13 +1285,13 @@
%defattr(-,root,root)
%license LICENSE.LGPL2.1
%{_libdir}/libsystemd.so.0
-%{_libdir}/libsystemd.so.0.32.0
+%{_libdir}/libsystemd.so.0.33.0
%files -n libudev%{?mini}1
%defattr(-,root,root)
%license LICENSE.LGPL2.1
%{_libdir}/libudev.so.1
-%{_libdir}/libudev.so.1.7.2
+%{_libdir}/libudev.so.1.7.3
%if %{with coredump}
%files coredump
@@ -1289,14 +1304,14 @@
%{_sysusersdir}/systemd-coredump.conf
%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%dir %{_localstatedir}/lib/systemd/coredump
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_mandir}/man1/coredumpctl*
%{_mandir}/man5/coredump.conf*
%{_mandir}/man8/systemd-coredump*
%endif
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%files lang -f systemd.lang
%files -n nss-myhostname
@@ -1383,6 +1398,10 @@
%{_unitdir}/systemd-homed.service
%{_unitdir}/systemd-homed-activate.service
%{_pam_moduledir}/pam_systemd_home.so
+%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.home1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.home1.policy
++++++ 0001-conf-parser-introduce-early-drop-ins.patch ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.348857539 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.352857545 +0200
@@ -1,4 +1,4 @@
-From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001
+From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001
From: Franck Bui <f...@suse.com>
Date: Fri, 22 Jan 2021 14:57:08 +0100
Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins
@@ -61,15 +61,15 @@
Fixes: #2121
---
- src/shared/conf-parser.c | 48 ++++++++++--
- src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 195 insertions(+), 5 deletions(-)
+ src/shared/conf-parser.c | 48 +++++++++--
+ src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 197 insertions(+), 5 deletions(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index d0ac1b2660..cb453fa50d 100644
+index 1e1967d7ea..eb81732dfa 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
-@@ -430,6 +430,7 @@ int config_parse(
+@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap
**stats_by_path, const char *path,
static int config_parse_many_files(
const char* const* conf_files,
@@ -77,20 +77,20 @@
char **files,
const char *sections,
ConfigItemLookup lookup,
-@@ -442,6 +443,12 @@ static int config_parse_many_files(
- char **fn;
- int r;
-
+@@ -481,6 +482,12 @@ static int config_parse_many_files(
+ stats_by_path = hashmap_new(&path_hash_ops_free_free);
+ if (!stats_by_path)
+ return -ENOMEM;
++ }
++
+ STRV_FOREACH(fn, early_files) {
-+ r = config_parse(NULL, *fn, NULL, sections, lookup, table,
flags, userdata, &mtime);
++ r = config_parse(NULL, *fn, NULL, sections, lookup, table,
flags, userdata, &st);
+ if (r < 0)
+ return r;
-+ }
-+
+ }
+
/* First read the first found main config file. */
- STRV_FOREACH(fn, (char**) conf_files) {
- r = config_parse(NULL, *fn, NULL, sections, lookup, table,
flags, userdata, &mtime);
-@@ -464,6 +471,28 @@ static int config_parse_many_files(
+@@ -521,6 +528,28 @@ static int config_parse_many_files(
return 0;
}
@@ -119,9 +119,9 @@
/* Parse each config file in the directories specified as nulstr. */
int config_parse_many_nulstr(
const char *conf_file,
-@@ -475,15 +504,19 @@ int config_parse_many_nulstr(
+@@ -532,15 +561,19 @@ int config_parse_many_nulstr(
void *userdata,
- usec_t *ret_mtime) {
+ Hashmap **ret_stats_by_path) {
- _cleanup_strv_free_ char **files = NULL;
+ _cleanup_strv_free_ char **files = NULL, **early_files = NULL,
**late_files = NULL;
@@ -139,12 +139,12 @@
+
+ return config_parse_many_files(STRV_MAKE_CONST(conf_file),
early_files, late_files,
+ sections, lookup, table, flags,
userdata,
- ret_mtime);
+ ret_stats_by_path);
}
-@@ -499,8 +532,8 @@ int config_parse_many(
+@@ -556,8 +589,8 @@ int config_parse_many(
void *userdata,
- usec_t *ret_mtime) {
+ Hashmap **ret_stats_by_path) {
+ _cleanup_strv_free_ char **files = NULL, **early_files = NULL,
**late_files = NULL;
_cleanup_strv_free_ char **dropin_dirs = NULL;
@@ -152,22 +152,22 @@
const char *suffix;
int r;
-@@ -513,7 +546,12 @@ int config_parse_many(
+@@ -570,7 +603,12 @@ int config_parse_many(
if (r < 0)
return r;
-- return config_parse_many_files(conf_files, files, sections, lookup,
table, flags, userdata, ret_mtime);
+- return config_parse_many_files(conf_files, files, sections, lookup,
table, flags, userdata, ret_stats_by_path);
+ r = config_parse_split_conf_files(files, &early_files, &late_files);
+ if (r < 0)
+ return r;
+
+ return config_parse_many_files(conf_files, early_files, late_files,
-+ sections, lookup, table, flags,
userdata, ret_mtime);
++ sections, lookup, table, flags,
userdata, ret_stats_by_path);
}
#define DEFINE_PARSER(type, vartype, conv_func) \
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
-index 5da864347e..77d9f28a79 100644
+index e61932ab16..de408272f0 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -5,6 +5,9 @@
@@ -179,9 +179,9 @@
+#include "rm-rf.h"
#include "string-util.h"
#include "strv.h"
- #include "tmpfile-util.h"
-@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s)
{
- }
+ #include "tests.h"
+@@ -391,4 +394,155 @@ TEST(config_parse) {
+ test_config_parse_one(i, config_file[i]);
}
+static void setup_conf_files(const char *root, bool is_main, char
**conf_files, char ***ret_conf_dirs) {
@@ -228,8 +228,8 @@
+ }
+}
+
-+static void test_config_parse_many_one(bool nulstr, const char *main, char
**conf_files,
-+ const char *name, const char *early,
const char *late) {
++static void test_config_parse_many_nulstr_one(bool nulstr, const char *main,
char **conf_files,
++ const char *name, const char
*early, const char *late) {
+
+ _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL,
*parsed_late = NULL;
+ _cleanup_strv_free_ char **conf_dirs = NULL;
@@ -281,68 +281,62 @@
+ assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
+}
+
-+static void test_config_parse_many(bool nulstr) {
++static void test_config_parse_many_nulstr(bool nulstr) {
+ log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : "");
+
-+ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL);
++ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL,
NULL);
+
-+ test_config_parse_many_one(nulstr,
-+ "dir/main.conf", NULL,
-+ "dir/main.conf", NULL, NULL);
-+
-+ test_config_parse_many_one(nulstr,
-+ NULL, STRV_MAKE("dir1/50-foo.conf"),
-+ "dir1/50-foo.conf", NULL,
"dir1/50-foo.conf");
-+
-+ test_config_parse_many_one(nulstr,
-+ NULL, STRV_MAKE("dir1/__50-foo.conf"),
-+ "dir1/__50-foo.conf",
"dir1/__50-foo.conf", NULL);
-+
-+ test_config_parse_many_one(nulstr,
-+ NULL, STRV_MAKE("dir1/10-foo.conf",
"dir1/50-bar.conf"),
-+ "dir1/50-bar.conf", NULL,
"dir1/50-bar.conf");
-+
-+ test_config_parse_many_one(nulstr,
-+ NULL, STRV_MAKE("dir1/50-foo.conf",
"dir2/10-bar.conf"),
-+ "dir1/50-foo.conf", NULL,
"dir1/50-foo.conf");
-+
-+ test_config_parse_many_one(nulstr,
-+ NULL, STRV_MAKE("dir1/10-foo.conf",
"dir2/10-foo.conf"),
-+ "dir1/10-foo.conf", NULL,
"dir1/10-foo.conf");
++ test_config_parse_many_nulstr_one(nulstr,
++ "dir/main.conf", NULL,
++ "dir/main.conf", NULL, NULL);
++
++ test_config_parse_many_nulstr_one(nulstr,
++ NULL, STRV_MAKE("dir1/50-foo.conf"),
++ "dir1/50-foo.conf", NULL,
"dir1/50-foo.conf");
++
++ test_config_parse_many_nulstr_one(nulstr,
++ NULL,
STRV_MAKE("dir1/__50-foo.conf"),
++ "dir1/__50-foo.conf",
"dir1/__50-foo.conf", NULL);
++
++ test_config_parse_many_nulstr_one(nulstr,
++ NULL, STRV_MAKE("dir1/10-foo.conf",
"dir1/50-bar.conf"),
++ "dir1/50-bar.conf", NULL,
"dir1/50-bar.conf");
++
++ test_config_parse_many_nulstr_one(nulstr,
++ NULL, STRV_MAKE("dir1/50-foo.conf",
"dir2/10-bar.conf"),
++ "dir1/50-foo.conf", NULL,
"dir1/50-foo.conf");
++
++ test_config_parse_many_nulstr_one(nulstr,
++ NULL, STRV_MAKE("dir1/10-foo.conf",
"dir2/10-foo.conf"),
++ "dir1/10-foo.conf", NULL,
"dir1/10-foo.conf");
+
+ /* Early conf files should never override the main one whatever their
+ * priority/location. */
-+ test_config_parse_many_one(nulstr,
-+ "dir/10-main.conf",
-+ STRV_MAKE("dir1/__10-foo.conf",
"dir2/__99-foo.conf"),
-+ "dir/10-main.conf", "dir2/__99-foo.conf",
NULL);
++ test_config_parse_many_nulstr_one(nulstr,
++ "dir/10-main.conf",
++ STRV_MAKE("dir1/__10-foo.conf",
"dir2/__99-foo.conf"),
++ "dir/10-main.conf",
"dir2/__99-foo.conf", NULL);
+
+ /* Late conf files always take precendence over the early conf files
+ * and the main one. */
-+ test_config_parse_many_one(nulstr,
-+ "dir/50-main.conf",
STRV_MAKE("dir1/10-foo.conf"),
-+ "dir1/10-foo.conf", NULL,
"dir1/10-foo.conf");
-+
-+ test_config_parse_many_one(nulstr,
-+ "dir/10-main.conf",
-+ STRV_MAKE("dir1/__10-foo.conf",
"dir2/__99-foo.conf",
-+ "dir2/10-foo.conf"),
-+ "dir2/10-foo.conf", "dir2/__99-foo.conf",
"dir2/10-foo.conf");
++ test_config_parse_many_nulstr_one(nulstr,
++ "dir/50-main.conf",
STRV_MAKE("dir1/10-foo.conf"),
++ "dir1/10-foo.conf", NULL,
"dir1/10-foo.conf");
++
++ test_config_parse_many_nulstr_one(nulstr,
++ "dir/10-main.conf",
++ STRV_MAKE("dir1/__10-foo.conf",
"dir2/__99-foo.conf",
++ "dir2/10-foo.conf"),
++ "dir2/10-foo.conf",
"dir2/__99-foo.conf", "dir2/10-foo.conf");
+}
+
- int main(int argc, char **argv) {
- unsigned i;
-
-@@ -407,5 +556,8 @@ int main(int argc, char **argv) {
- for (i = 0; i < ELEMENTSOF(config_file); i++)
- test_config_parse(i, config_file[i]);
-
-+ test_config_parse_many(true);
-+ test_config_parse_many(false);
++TEST(config_parse_many) {
++ test_config_parse_many_nulstr(true);
++ test_config_parse_many_nulstr(false);
++}
+
- return 0;
- }
+ DEFINE_TEST_MAIN(LOG_INFO);
--
-2.26.2
+2.34.1
++++++ 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.368857566 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.372857572 +0200
@@ -1,4 +1,4 @@
-From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001
+From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcro...@suse.com>
Date: Mon, 29 Oct 2012 13:01:20 +0000
Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they
@@ -13,10 +13,10 @@
create mode 100644 units/var-run.mount
diff --git a/units/meson.build b/units/meson.build
-index 17e9ead9c1..7b926f9f91 100644
+index a9bf28f6d9..739fd84d2c 100644
--- a/units/meson.build
+++ b/units/meson.build
-@@ -160,6 +160,8 @@ units = [
+@@ -165,6 +165,8 @@ units = [
['umount.target', ''],
['usb-gadget.target', ''],
['user.slice', ''],
@@ -24,7 +24,7 @@
+ ['var-lock.mount', 'HAVE_SYSV_COMPAT',
'local-fs.target.wants/'],
['var-lib-machines.mount', 'ENABLE_MACHINED',
'remote-fs.target.wants/ machines.target.wants/'],
- ]
+ ['systemd-oomd.socket', 'ENABLE_OOMD'],
diff --git a/units/var-lock.mount b/units/var-lock.mount
new file mode 100644
index 0000000000..07277adac3
@@ -76,6 +76,6 @@
+Type=bind
+Options=bind
--
-2.26.2
+2.34.1
++++++ 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch ++++++
>From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001
From: Franck Bui <f...@suse.com>
Date: Thu, 17 Mar 2022 11:35:33 +0100
Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin"
This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c.
---
units/console-getty.service.in | 4 +---
units/container-ge...@.service.in | 4 +---
units/ge...@.service.in | 4 +---
units/serial-ge...@.service.in | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index 73871d6f50..bb67541dce 100644
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud -
115200,38400,9600 $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console
115200,38400,9600 $TERM
Type=idle
Restart=always
UtmpIdentifier=cons
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/console
TTYReset=yes
TTYVHangup=yes
diff --git a/units/container-ge...@.service.in
b/units/container-ge...@.service.in
index a6e3f94e2a..ed1eb7bde1 100644
--- a/units/container-ge...@.service.in
+++ b/units/container-ge...@.service.in
@@ -28,13 +28,11 @@ Before=rescue.service
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud -
115200,38400,9600 $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I
115200,38400,9600 $TERM
Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=pts/%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/pts/%I
TTYReset=yes
TTYVHangup=yes
diff --git a/units/ge...@.service.in b/units/ge...@.service.in
index 21d66f9367..78deb7cffe 100644
--- a/units/ge...@.service.in
+++ b/units/ge...@.service.in
@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
diff --git a/units/serial-ge...@.service.in b/units/serial-ge...@.service.in
index 2433124c55..bb7af3105d 100644
--- a/units/serial-ge...@.service.in
+++ b/units/serial-ge...@.service.in
@@ -33,12 +33,10 @@ Before=rescue.service
# The '-o' option value tells agetty to replace 'login' arguments with an
# option to preserve environment (-p), followed by '--' for safety, and then
# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 -
$TERM
+ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I
$TERM
Type=idle
Restart=always
UtmpIdentifier=%I
-StandardInput=tty
-StandardOutput=tty
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
--
2.34.1
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.464857697 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.468857702 +0200
@@ -2,9 +2,10 @@
# https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart
#
systemd
- supplements "packageand(systemd:pam-<targettype>)"
+ supplements "(systemd and pam-<targettype>)"
-/lib/systemd/system/
- -/usr/lib/systemd/libsystemd-shared.*\.so
+ -/usr/lib/systemd
+ -/usr/lib/cryptsetup
post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
libsystemd0
libudev1
++++++ files.container ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.492857735 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.496857741 +0200
@@ -3,7 +3,7 @@
#
%dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_datadir}/bash-completion/completions/systemd-nspawn
%{_datadir}/zsh/site-functions/_systemd-nspawn
%{_mandir}/man1/systemd-nspawn.1.gz
@@ -17,6 +17,9 @@
%dir %{_unitdir}/machines.target.wants
%{_bindir}/machinectl
%{_datadir}/bash-completion/completions/machinectl
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
@@ -40,6 +43,8 @@
%endif
%if %{with importd}
+%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
++++++ files.devel ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.524857779 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.528857784 +0200
@@ -7,7 +7,7 @@
%{_libdir}/libudev.so
%{_libdir}/pkgconfig/libsystemd.pc
%{_libdir}/pkgconfig/libudev.pc
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_mandir}/man3/SD_ALERT.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz
@@ -55,6 +55,7 @@
%{_mandir}/man3/SD_BUS_PROPERTY.3.gz
%{_mandir}/man3/SD_BUS_SIGNAL.3.gz
%{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz
+%{_mandir}/man3/SD_BUS_VTABLE_CAPABILITY.3.gz
%{_mandir}/man3/SD_BUS_VTABLE_END.3.gz
%{_mandir}/man3/SD_BUS_VTABLE_START.3.gz
%{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz
@@ -84,6 +85,8 @@
%{_mandir}/man3/SD_ID128_MAKE_STR.3.gz
%{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz
%{_mandir}/man3/SD_ID128_NULL.3.gz
+%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz
+%{_mandir}/man3/SD_ID128_TO_STRING.3.gz
%{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz
%{_mandir}/man3/SD_INFO.3.gz
%{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz
@@ -426,6 +429,7 @@
%{_mandir}/man3/sd_event_add_defer.3.gz
%{_mandir}/man3/sd_event_add_exit.3.gz
%{_mandir}/man3/sd_event_add_inotify.3.gz
+%{_mandir}/man3/sd_event_add_inotify_fd.3.gz
%{_mandir}/man3/sd_event_add_io.3.gz
%{_mandir}/man3/sd_event_add_post.3.gz
%{_mandir}/man3/sd_event_add_signal.3.gz
@@ -495,6 +499,7 @@
%{_mandir}/man3/sd_event_source_set_prepare.3.gz
%{_mandir}/man3/sd_event_source_set_priority.3.gz
%{_mandir}/man3/sd_event_source_set_ratelimit.3.gz
+%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz
%{_mandir}/man3/sd_event_source_set_time.3.gz
%{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz
%{_mandir}/man3/sd_event_source_set_time_relative.3.gz
++++++ files.network ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.552857816 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.556857822 +0200
@@ -7,6 +7,10 @@
%dir %{_systemd_util_dir}/network
%{_bindir}/networkctl
%{_datadir}/bash-completion/completions/networkctl
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
@@ -15,11 +19,13 @@
%{_mandir}/man1/networkctl.1.gz
%{_mandir}/man5/networkd.conf.5.gz
%{_mandir}/man5/networkd.conf.d.5.gz
+%{_mandir}/man5/org.freedesktop.network1.5.gz
%{_mandir}/man5/systemd.network.5.gz
%{_mandir}/man8/systemd-networkd-wait-online.8.gz
%{_mandir}/man8/systemd-networkd-wait-online.service.8.gz
%{_mandir}/man8/systemd-networkd.8.gz
%{_mandir}/man8/systemd-networkd.service.8.gz
+%{_systemd_util_dir}/network/80-6rd-tunnel.network
%{_systemd_util_dir}/network/80-container-host0.network
%{_systemd_util_dir}/network/80-container-ve.network
%{_systemd_util_dir}/network/80-container-vz.network
@@ -40,6 +46,9 @@
%{_bindir}/systemd-resolve
%{_datadir}/bash-completion/completions/resolvectl
%{_datadir}/bash-completion/completions/systemd-resolve
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml
%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy
++++++ files.systemd ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.588857865 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.592857871 +0200
@@ -8,11 +8,12 @@
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf
%dir %{_binfmtdir}
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%endif
%dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/interfaces
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%dir %{_datadir}/dbus-1/system.d
@@ -20,14 +21,15 @@
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%dir %{_datadir}/systemd
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%endif
-%dir %{xinitconfdir}
-%dir %{xinitconfdir}/xinitrc.d
%dir %{_environmentdir}
%dir %{_journalcatalogdir}
+%if ! %{bootstrap}
+%dir %{_libdir}/cryptsetup
+%endif
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/catalog
%dir %{_modprobedir}
@@ -82,6 +84,8 @@
%dir %{_unitdir}/sockets.target.wants
%dir %{_unitdir}/sysinit.target.wants
%dir %{_unitdir}/timers.target.wants
+%dir %{xinitconfdir}
+%dir %{xinitconfdir}/xinitrc.d
%doc %{_modprobedir}/README
%doc %{_sysctldir}/README
%doc %{_sysusersdir}/README
@@ -113,7 +117,8 @@
%{_bindir}/systemd-cat
%{_bindir}/systemd-cgls
%{_bindir}/systemd-cgtop
-%if ! 0%{?bootstrap}
+%{_bindir}/systemd-creds
+%if ! %{bootstrap}
%{_bindir}/systemd-cryptenroll
%endif
%{_bindir}/systemd-delta
@@ -136,7 +141,7 @@
%{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-umount
%{_bindir}/timedatectl
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%if %{with sd_boot}
%{_datadir}/bash-completion/completions/bootctl
%endif
@@ -160,6 +165,29 @@
%{_datadir}/bash-completion/completions/systemd-run
%{_datadir}/bash-completion/completions/timedatectl
%endif
+# dbus introspection data for code generators:
https://github.com/systemd/systemd/pull/20294
+%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
@@ -181,7 +209,7 @@
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/systemd/kbd-model-map
%{_datadir}/systemd/language-fallback-map
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%if %{with sd_boot}
%{_datadir}/zsh/site-functions/_bootctl
%endif
@@ -205,7 +233,6 @@
%{_datadir}/zsh/site-functions/_systemd-tmpfiles
%{_datadir}/zsh/site-functions/_timedatectl
%endif
-%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
%{_environmentdir}/99-environment.conf
%{_journalcatalogdir}/systemd.be.catalog
%{_journalcatalogdir}/systemd.be@latin.catalog
@@ -220,6 +247,11 @@
%{_journalcatalogdir}/systemd.zh_CN.catalog
%{_journalcatalogdir}/systemd.zh_TW.catalog
%if ! 0%{bootstrap}
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
+%endif
+%if ! 0%{bootstrap}
%if %{with sd_boot}
%{_mandir}/man1/bootctl.1.gz
%endif
@@ -235,6 +267,7 @@
%{_mandir}/man1/systemd-cat.1.gz
%{_mandir}/man1/systemd-cgls.1.gz
%{_mandir}/man1/systemd-cgtop.1.gz
+%{_mandir}/man1/systemd-creds.1.gz
%{_mandir}/man1/systemd-cryptenroll.1.gz
%{_mandir}/man1/systemd-delta.1.gz
%{_mandir}/man1/systemd-detect-virt.1.gz
@@ -250,6 +283,7 @@
%{_mandir}/man1/systemd-path.1.gz
%{_mandir}/man1/systemd-run.1.gz
%{_mandir}/man1/systemd-socket-activate.1.gz
+%{_mandir}/man1/systemd-stdio-bridge.1.gz
%{_mandir}/man1/systemd-tty-ask-password-agent.1.gz
%{_mandir}/man1/systemd-umount.1.gz
%{_mandir}/man1/systemd.1.gz
@@ -258,8 +292,10 @@
%{_mandir}/man5/crypttab.5.gz
%{_mandir}/man5/dnssec-trust-anchors.d.5.gz
%{_mandir}/man5/environment.d.5.gz
+%{_mandir}/man5/extension-release.5.gz
%{_mandir}/man5/hostname.5.gz
%{_mandir}/man5/initrd-release.5.gz
+%{_mandir}/man5/integritytab.5.gz
%{_mandir}/man5/journald.conf.5.gz
%{_mandir}/man5/journald.conf.d.5.gz
%{_mandir}/man5/journ...@.conf.5.gz
@@ -323,8 +359,12 @@
%{_mandir}/man7/file-hierarchy.7.gz
%{_mandir}/man7/kernel-command-line.7.gz
%if %{with sd_boot}
+%{_mandir}/man7/linuxaa64.efi.stub.7.gz
+%{_mandir}/man7/linuxia32.efi.stub.7.gz
+%{_mandir}/man7/linuxx64.efi.stub.7.gz
%{_mandir}/man7/sd-boot.7.gz
%{_mandir}/man7/systemd-boot.7.gz
+%{_mandir}/man7/systemd-stub.7.gz
%endif
%{_mandir}/man7/systemd.directives.7.gz
%{_mandir}/man7/systemd.environment-generator.7.gz
@@ -383,6 +423,9 @@
%{_mandir}/man8/systemd-hostnamed.8.gz
%{_mandir}/man8/systemd-hostnamed.service.8.gz
%{_mandir}/man8/systemd-hybrid-sleep.service.8.gz
+%{_mandir}/man8/systemd-integritysetup-generator.8.gz
+%{_mandir}/man8/systemd-integritysetup.8.gz
+%{_mandir}/man8/systemd-integrityse...@.service.8.gz
%{_mandir}/man8/systemd-journald-audit.socket.8.gz
%{_mandir}/man8/systemd-journald-dev-log.socket.8.gz
%{_mandir}/man8/systemd-journald-varl...@.socket.8.gz
@@ -455,7 +498,7 @@
%{_modprobedir}/systemd.conf
%{_pam_moduledir}/pam_systemd.so
%{_pam_vendordir}/systemd-user
-%{_prefix}/lib/kernel/install.d/00-entry-directory.install
+%{_prefix}/lib/kernel/install.conf
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
%{_sbindir}/halt
@@ -472,7 +515,7 @@
%{_systemd_util_dir}/boot/efi/linux*.elf.stub
%{_systemd_util_dir}/boot/efi/systemd-boot*.efi
%endif
-%{_systemd_util_dir}/libsystemd-shared-249.so
+%{_systemd_util_dir}/libsystemd-shared-250.so
%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list
%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh
%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh
@@ -486,13 +529,16 @@
%endif
%{_systemd_util_dir}/systemd-boot-check-no-failures
%{_systemd_util_dir}/systemd-cgroups-agent
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-cryptsetup
%endif
%{_systemd_util_dir}/systemd-fsck
%{_systemd_util_dir}/systemd-growfs
%{_systemd_util_dir}/systemd-hibernate-resume
%{_systemd_util_dir}/systemd-hostnamed
+%if ! %{bootstrap}
+%{_systemd_util_dir}/systemd-integritysetup
+%endif
%{_systemd_util_dir}/systemd-journald
%{_systemd_util_dir}/systemd-localed
%{_systemd_util_dir}/systemd-logind
@@ -516,7 +562,7 @@
%{_systemd_util_dir}/systemd-user-runtime-dir
%{_systemd_util_dir}/systemd-user-sessions
%{_systemd_util_dir}/systemd-vconsole-setup
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-veritysetup
%endif
%{_systemd_util_dir}/systemd-volatile-root
@@ -548,7 +594,7 @@
%if %{with sd_boot}
%{_systemdgeneratordir}/systemd-bless-boot-generator
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-cryptsetup-generator
%endif
%{_systemdgeneratordir}/systemd-debug-generator
@@ -556,9 +602,12 @@
%{_systemdgeneratordir}/systemd-getty-generator
%{_systemdgeneratordir}/systemd-gpt-auto-generator
%{_systemdgeneratordir}/systemd-hibernate-resume-generator
+%if ! %{bootstrap}
+%{_systemdgeneratordir}/systemd-integritysetup-generator
+%endif
%{_systemdgeneratordir}/systemd-run-generator
%{_systemdgeneratordir}/systemd-system-update-generator
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-veritysetup-generator
%endif
%{_sysusersdir}/systemd-journal.conf
@@ -586,7 +635,7 @@
%{_unitdir}/boot-complete.target
%{_unitdir}/console-getty.service
%{_unitdir}/container-getty@.service
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/cryptsetup-pre.target
%{_unitdir}/cryptsetup.target
%endif
@@ -602,6 +651,7 @@
%{_unitdir}/emergency.service
%{_unitdir}/emergency.target
%{_unitdir}/exit.target
+%{_unitdir}/factory-reset.target
%{_unitdir}/final.target
%{_unitdir}/first-boot-complete.target
%{_unitdir}/getty-pre.target
@@ -615,7 +665,7 @@
%{_unitdir}/initrd-fs.target
%{_unitdir}/initrd-parse-etc.service
%{_unitdir}/initrd-root-device.target
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
%endif
@@ -624,6 +674,10 @@
%{_unitdir}/initrd-switch-root.target
%{_unitdir}/initrd-usr-fs.target
%{_unitdir}/initrd.target
+%if ! %{bootstrap}
+%{_unitdir}/integritysetup-pre.target
+%{_unitdir}/integritysetup.target
+%endif
%{_unitdir}/kexec.target
%{_unitdir}/local-fs-pre.target
%{_unitdir}/local-fs.target
@@ -646,12 +700,12 @@
%{_unitdir}/proc-sys-fs-binfmt_misc.mount
%{_unitdir}/quotaon.service
%{_unitdir}/reboot.target
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/remote-cryptsetup.target
%endif
%{_unitdir}/remote-fs-pre.target
%{_unitdir}/remote-fs.target
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/remote-veritysetup.target
%endif
%{_unitdir}/rescue.service
@@ -675,11 +729,14 @@
%{_unitdir}/sys-kernel-debug.mount
%{_unitdir}/sys-kernel-tracing.mount
%{_unitdir}/sysinit.target
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/sysinit.target.wants/cryptsetup.target
%endif
%{_unitdir}/sysinit.target.wants/dev-hugepages.mount
%{_unitdir}/sysinit.target.wants/dev-mqueue.mount
+%if ! %{bootstrap}
+%{_unitdir}/sysinit.target.wants/integritysetup.target
+%endif
%{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
%{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount
%{_unitdir}/sysinit.target.wants/sys-kernel-config.mount
@@ -703,11 +760,11 @@
%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service
%{_unitdir}/sysinit.target.wants/systemd-update-done.service
%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/sysinit.target.wants/veritysetup.target
%endif
%{_unitdir}/syslog.socket
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/system-systemd\x2dcryptsetup.slice
%endif
%{_unitdir}/system-update-cleanup.service
@@ -725,6 +782,7 @@
%{_unitdir}/systemd-boot-check-no-failures.service
%if %{with sd_boot}
%{_unitdir}/systemd-boot-system-token.service
+%{_unitdir}/systemd-boot-update.service
%endif
%{_unitdir}/systemd-exit.service
%{_unitdir}/systemd-firstboot.service
@@ -784,10 +842,11 @@
%{_unitdir}/user-runtime-dir@.service
%{_unitdir}/user.slice
%{_unitdir}/user@.service
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_unitdir}/veritysetup-pre.target
%{_unitdir}/veritysetup.target
%endif
+%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
%if %{with split_usr}
/bin/systemctl
/sbin/halt
++++++ files.udev ++++++
--- /var/tmp/diff_new_pack.3wNnLm/_old 2022-03-28 16:59:11.636857931 +0200
+++ /var/tmp/diff_new_pack.3wNnLm/_new 2022-03-28 16:59:11.640857936 +0200
@@ -14,14 +14,14 @@
%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
%{_bindir}/systemd-hwdb
%{_bindir}/udevadm
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_datadir}/bash-completion/completions/udevadm
%endif
%{_datadir}/pkgconfig/udev.pc
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_datadir}/zsh/site-functions/_udevadm
%endif
-%if ! 0%{?bootstrap}
+%if ! %{bootstrap}
%{_mandir}/man5/udev.conf.5.gz
%{_mandir}/man7/hwdb.7.gz
%{_mandir}/man7/udev.7.gz
@@ -70,6 +70,8 @@
%{_udevhwdbdir}/60-keyboard.hwdb
%{_udevhwdbdir}/60-seat.hwdb
%{_udevhwdbdir}/60-sensor.hwdb
+%{_udevhwdbdir}/70-analyzers.hwdb
+%{_udevhwdbdir}/70-cameras.hwdb
%{_udevhwdbdir}/70-joystick.hwdb
%{_udevhwdbdir}/70-mouse.hwdb
%{_udevhwdbdir}/70-pointingstick.hwdb
@@ -92,6 +94,7 @@
%{_udevrulesdir}/60-serial.rules
%{_udevrulesdir}/61-persistent-storage-compat.rules
%{_udevrulesdir}/64-btrfs.rules
+%{_udevrulesdir}/70-camera.rules
%{_udevrulesdir}/70-joystick.rules
%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips
%{_udevrulesdir}/70-memory.rules
++++++ systemd-v249.10+suse.86.g0bb1977021.tar.xz ->
systemd-v250.4+suse.35.g8ef8dfd540.tar.xz ++++++
/work/SRC/openSUSE:Factory/systemd/systemd-v249.10+suse.86.g0bb1977021.tar.xz
/work/SRC/openSUSE:Factory/.systemd.new.1900/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz
differ: char 25, line 1
