From c6409a599dbd59946666994bf9cf15a77871f8d29adb5fd2ad8b576388fe8134 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 13 Oct 2022 07:45:15 +0000 Subject: [PATCH 1/4] - avoid expanding of macro in comment which leads to an error on installation OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1316 --- systemd.changes | 6 ++++++ systemd.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index fc99295..35f322a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 18:35:47 UTC 2022 - Dirk Müller + +- avoid expanding of macro in comment which leads to an error + on installation + ------------------------------------------------------------------- Tue Oct 4 08:51:48 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 7c1240f..7fee794 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1062,7 +1062,7 @@ fi %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : %postun -# daemon-reload is implied by %%systemd_postun_with_restart +# daemon-reload is implied by systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) From 7a0cee7ab3a899089b1a2f98928a040421610c6c06eec0d343691bcc5fdb5538 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 13 Oct 2022 07:48:02 +0000 Subject: [PATCH 2/4] previous change is a workaround for bsc#1203847, mention it in the .changes file OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1317 --- systemd.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd.changes b/systemd.changes index 35f322a..969c12d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed Oct 12 18:35:47 UTC 2022 - Dirk Müller -- avoid expanding of macro in comment which leads to an error - on installation +- Avoid expanding of macro in comment which leads to an error on installation + (workaround for bsc#1203847) ------------------------------------------------------------------- Tue Oct 4 08:51:48 UTC 2022 - Franck Bui From 2aade03ee599bdb6019ceea7429b13e69139fe17986ecef6c5c6db0e7e03bade Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 Oct 2022 14:06:35 +0000 Subject: [PATCH 3/4] - Don't create /var/lib/systemd/random-seed in %post (bsc#1181458) To make sure that the same seed is not replicated when installing from a 'golden' image. For regular installations the random seed file is initialized by the installer itself (bsc#1174964). Even if it didn't, the random seed file would be created on first boot anyway. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1318 --- systemd.changes | 12 ++++++++++++ systemd.spec | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/systemd.changes b/systemd.changes index 969c12d..7dc8998 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Oct 19 07:23:51 UTC 2022 - Franck Bui + +- Don't create /var/lib/systemd/random-seed in %post (bsc#1181458) + + To make sure that the same seed is not replicated when installing from a + 'golden' image. + + For regular installations the random seed file is initialized by the installer + itself (bsc#1174964). Even if it didn't, the random seed file would be created + on first boot anyway. + ------------------------------------------------------------------- Wed Oct 12 18:35:47 UTC 2022 - Dirk Müller diff --git a/systemd.spec b/systemd.spec index 7fee794..0606f5b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -987,9 +987,6 @@ pam-config --add --systemd || : %sysusers_create systemd-journal.conf %sysusers_create systemd-timesync.conf -[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : -/usr/lib/systemd/systemd-random-seed save || : - systemctl daemon-reexec || : # Reexecute user manager instances (if any). It is asynchronous but it From 2d5fadb659435d28e40db04a03024612e51cc5f05ade2fc28d7be2077699e459 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 21 Oct 2022 09:30:18 +0000 Subject: [PATCH 4/4] - Import commit f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 (merge of v251.6) Beside the merge of v251.6, it also includes the following backport: - 07aaa898bd pstore: do not try to load all known pstore modules For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/07aa29e3942fb46b0aed5405c88e8d3179ca958f...f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1319 --- systemd-v251.5+suse.31.g07aa29e394.tar.xz | 3 --- systemd-v251.6+suse.34.gf78bba8d03.tar.xz | 3 +++ systemd.changes | 13 +++++++++++++ systemd.spec | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 systemd-v251.5+suse.31.g07aa29e394.tar.xz create mode 100644 systemd-v251.6+suse.34.gf78bba8d03.tar.xz diff --git a/systemd-v251.5+suse.31.g07aa29e394.tar.xz b/systemd-v251.5+suse.31.g07aa29e394.tar.xz deleted file mode 100644 index adadfbe..0000000 --- a/systemd-v251.5+suse.31.g07aa29e394.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ae6e8e70daf4297f4324f0a7776ed155f991dbfc29764443868f0f1edc727c1 -size 7835336 diff --git a/systemd-v251.6+suse.34.gf78bba8d03.tar.xz b/systemd-v251.6+suse.34.gf78bba8d03.tar.xz new file mode 100644 index 0000000..6498613 --- /dev/null +++ b/systemd-v251.6+suse.34.gf78bba8d03.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f820714e952b74f90cdfff0df2de83e6e415bfc3f9f45b8225168912571465c +size 7837344 diff --git a/systemd.changes b/systemd.changes index 7dc8998..524f4e3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 21 09:07:05 UTC 2022 - Franck Bui + +- Import commit f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 (merge of v251.6) + + Beside the merge of v251.6, it also includes the following backport: + + - 07aaa898bd pstore: do not try to load all known pstore modules + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/07aa29e3942fb46b0aed5405c88e8d3179ca958f...f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 + + ------------------------------------------------------------------- Wed Oct 19 07:23:51 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 0606f5b..d3a673c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.31.g07aa29e394 +%define archive_version +suse.34.gf78bba8d03 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.5 +Version: 251.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later