diff --git a/systemd-mini.changes b/systemd-mini.changes index a93d76e2..d28a872f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Sep 8 17:01:58 UTC 2021 - Franck Bui + +- Don't reexecute user manager instances on package update yet + + This can't be done until users have their user instance updated to + the new version that supports reexecuting with SIGRTMIN+25 because + this signal terminates the user managers for the previous versions. + +------------------------------------------------------------------- +Wed Sep 8 13:21:34 UTC 2021 - Franck Bui + +- Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 + + 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only + fd46c81922 test: make sure to include all haveged unit files + +- systemd.spec: reexec user manager instances on package updates + +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + +------------------------------------------------------------------- +Thu Sep 2 10:01:23 UTC 2021 - Franck Bui + +- Drop dependency on m4 (replaced by Jinja2) + ------------------------------------------------------------------- Wed Sep 1 11:54:23 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 1112b547..2de1c70e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.32.g40bda18e34 +%define suse_version +suse.35.gec72db9ee0 %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -96,7 +96,6 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel BuildRequires: python3-jinja2 @@ -277,13 +276,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -369,12 +369,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -567,6 +567,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -578,7 +579,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as @@ -941,7 +941,23 @@ pam-config --add --systemd || : [ -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 +# shouldn't be a problem in practice: a problem would arise only if +# the new version of a user service has a brand new option that is +# only understood by the latest version of the user manager and the +# user service is started before the user manager get reexecuted. But +# this case is very unlikely especially since we don't restart any +# user service for now on. +# +# Before doing this, we unfortunately have to wait until users will +# reexec their user manager (by either rebooting or restarting their +# session) to a version that supports SIGRTMIN+25 otherwise sending +# the signal to an old version will kill the manager which means +# tearing down the user session. +# +# systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : %journal_catalog_update %tmpfiles_create diff --git a/systemd-v249.4+suse.32.g40bda18e34.tar.xz b/systemd-v249.4+suse.32.g40bda18e34.tar.xz deleted file mode 100644 index d130d483..00000000 --- a/systemd-v249.4+suse.32.g40bda18e34.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fddc0b0846c692af8bae3673728a0d95bfdcc448846c218e850b6b93e5493c2a -size 7265384 diff --git a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz new file mode 100644 index 00000000..d8ceb7cf --- /dev/null +++ b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d581f2ec411b41826c395147fe9a040b0e916de7fdeeaae0681f43be8b92bb82 +size 7266280 diff --git a/systemd.changes b/systemd.changes index a93d76e2..d28a872f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Sep 8 17:01:58 UTC 2021 - Franck Bui + +- Don't reexecute user manager instances on package update yet + + This can't be done until users have their user instance updated to + the new version that supports reexecuting with SIGRTMIN+25 because + this signal terminates the user managers for the previous versions. + +------------------------------------------------------------------- +Wed Sep 8 13:21:34 UTC 2021 - Franck Bui + +- Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 + + 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only + fd46c81922 test: make sure to include all haveged unit files + +- systemd.spec: reexec user manager instances on package updates + +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + +------------------------------------------------------------------- +Thu Sep 2 10:01:23 UTC 2021 - Franck Bui + +- Drop dependency on m4 (replaced by Jinja2) + ------------------------------------------------------------------- Wed Sep 1 11:54:23 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index af809ac7..336ac697 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.32.g40bda18e34 +%define suse_version +suse.35.gec72db9ee0 %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -94,7 +94,6 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel BuildRequires: python3-jinja2 @@ -275,13 +274,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -367,12 +367,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -565,6 +565,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -576,7 +577,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as @@ -939,7 +939,23 @@ pam-config --add --systemd || : [ -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 +# shouldn't be a problem in practice: a problem would arise only if +# the new version of a user service has a brand new option that is +# only understood by the latest version of the user manager and the +# user service is started before the user manager get reexecuted. But +# this case is very unlikely especially since we don't restart any +# user service for now on. +# +# Before doing this, we unfortunately have to wait until users will +# reexec their user manager (by either rebooting or restarting their +# session) to a version that supports SIGRTMIN+25 otherwise sending +# the signal to an old version will kill the manager which means +# tearing down the user session. +# +# systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : %journal_catalog_update %tmpfiles_create