Accepting request 1030349 from Base:System

- 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:
  07aa29e394...f78bba8d03
  

- 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.

- Avoid expanding of macro in comment which leads to an error on installation
  (workaround for bsc#1203847)

OBS-URL: https://build.opensuse.org/request/show/1030349
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=366
This commit is contained in:
Dominique Leuenberger 2022-10-22 12:12:42 +00:00 committed by Git OBS Bridge
parent 31bf16d4f3
commit 371ec6bcf0
4 changed files with 37 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ae6e8e70daf4297f4324f0a7776ed155f991dbfc29764443868f0f1edc727c1
size 7835336

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f820714e952b74f90cdfff0df2de83e6e415bfc3f9f45b8225168912571465c
size 7837344

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Oct 21 09:07:05 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>
- 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 <dmueller@suse.com>
- 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 <fbui@suse.com> Tue Oct 4 08:51:48 UTC 2022 - Franck Bui <fbui@suse.com>

View File

@ -19,7 +19,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define min_kernel_version 4.5 %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 _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@ -72,7 +72,7 @@
Name: systemd%{?mini} Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd URL: http://www.freedesktop.org/wiki/Software/systemd
Version: 251.5 Version: 251.6
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -987,9 +987,6 @@ pam-config --add --systemd || :
%sysusers_create systemd-journal.conf %sysusers_create systemd-journal.conf
%sysusers_create systemd-timesync.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 || : systemctl daemon-reexec || :
# Reexecute user manager instances (if any). It is asynchronous but it # Reexecute user manager instances (if any). It is asynchronous but it
@ -1062,7 +1059,7 @@ fi
%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || :
%postun %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-journald.service
%systemd_postun_with_restart systemd-timesyncd.service %systemd_postun_with_restart systemd-timesyncd.service
# Avoid restarting logind until fixed upstream (issue #1163) # Avoid restarting logind until fixed upstream (issue #1163)