Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package systemd for openSUSE:Factory checked 
in at 2025-01-25 19:10:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
 and      /work/SRC/openSUSE:Factory/.systemd.new.2316 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "systemd"

Sat Jan 25 19:10:12 2025 rev:438 rq:1240175 version:257.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes  2024-12-30 
12:23:18.070229087 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new.2316/systemd.changes        
2025-01-25 19:10:26.839654303 +0100
@@ -1,0 +2,42 @@
+Wed Jan  8 16:43:48 UTC 2025 - Franck Bui <f...@suse.com>
+
+- Import commit 7fa3b5018bfffa176c77a2a5794dce792eebadcb (merge of v257.2)
+
+  For a complete list of changes, visit:
+  
https://github.com/openSUSE/systemd/compare/47eea9ee9f46537bc18d6a64fa21fd9c50538e13...7fa3b5018bfffa176c77a2a5794dce792eebadcb
+
+-------------------------------------------------------------------
+Thu Dec 26 11:15:21 UTC 2024 - Franck Bui <f...@suse.com>
+
+- systemd-update-helper: backport commit 2d0af8bc354f4a1429ce
+
+  Since user@.service has `Type=notify-reload` (making the reloading process
+  synchronous) and reloading implies reexecuting with `ReloadSignal=RTMIN+25`,
+  reexecuting user managers synchronously can be achieved with `systemctl 
reload
+  user@*.service" now.
+
+-------------------------------------------------------------------
+Thu Dec 26 10:07:33 UTC 2024 - Franck Bui <f...@suse.com>
+
+- Upgrade to v257.1 (commit 47eea9ee9f46537bc18d6a64fa21fd9c50538e13)
+
+  See https://github.com/openSUSE/systemd/blob/SUSE/v257/NEWS for details.
+
+  - This upgrade includes the following bug fixes:
+
+    - commit 9258e27f4a1ddf2834d0cadd66770ad65e55e066 (boo#1233752, 
bsc#1234313)
+    - commit 423de11f046cc2c9b6904e4eff71d6a48cd661c9 (boo#1233752, 
bsc#1234313)
+    - commit 2ae79a31b7c7947e2c16e18eb85ac5607ebc40b6 (bsc#1232844)
+
+- Drop 5006-tpm2-util-Also-retry-unsealing-after-policy_pcr-retu.patch and
+  5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
+
+  These two patches have bee merged upstream and are included in v257.1, see
+  above.
+
+- Our testsuite sub-package has been broken by upstream after they decided to
+  remove the bash test runner, see 
https://github.com/systemd/systemd/pull/34271
+  for details. For running the testsuite, the systemd git repository has to be
+  cloned for now. We'll try to adapt the testsuite sub-package these changes.
+
+-------------------------------------------------------------------
@@ -179,0 +222,2 @@
+    - commit c072860593329293e19580b337504adb52248462 (bsc#1229518)
+    - commit cfbf7538d87023840c5574fa5b0452e5b0f42149 (bsc#1229228)

Old:
----
  5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
  5006-tpm2-util-Also-retry-unsealing-after-policy_pcr-retu.patch
  systemd-v256.10+suse.13.gf962392e1e.tar.xz

New:
----
  systemd-257.2.tar.xz

BETA DEBUG BEGIN:
  Old:- Drop 5006-tpm2-util-Also-retry-unsealing-after-policy_pcr-retu.patch and
  5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
  Old:
- Drop 5006-tpm2-util-Also-retry-unsealing-after-policy_pcr-retu.patch and
  5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.007702078 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.011702242 +0100
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,13 +26,11 @@
 %define systemd_release    %{?release_override}%{!?release_override:0}
 %define archive_version    %{nil}
 %else
-%define systemd_version    256.10
+%define systemd_version    257.2
 %define systemd_release    0
-%define archive_version    +suse.13.gf962392e1e
+%define archive_version    %{nil}
 %endif
 
-%define systemd_major      %{sub %systemd_version 1 3}
-
 %define _testsuitedir %{_systemd_util_dir}/tests
 %define xinitconfdir  
%{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
 
@@ -182,7 +180,7 @@
 Obsoletes:      pm-utils <= 1.4.1
 Obsoletes:      suspend <= 1.0
 Obsoletes:      systemd-analyze < 201
-Source0:        systemd-v%{version}%{archive_version}.tar.xz
+Source0:        systemd-%{version}%{archive_version}.tar.xz
 Source1:        systemd-rpmlintrc
 Source3:        systemd-update-helper
 %if %{with sysvcompat}
@@ -216,31 +214,37 @@
 # All changes backported from upstream are tracked by the git repository, which
 # can be found at:  https://github.com/openSUSE/systemd.
 #
-# Patches listed below are openSUSE specific ones and should be kept at its
-# minimum. We try hard to push our changes to upstream but sometimes they are
-# only relevant for SUSE distros. Special rewards for those who will manage to
-# get rid of one of them !
+# The patches listed below are specific to openSUSE and should be kept to a
+# minimum.  We strive to push our changes upstream, but sometimes they are only
+# relevant for SUSE distributions. Special rewards for those who manage to
+# eliminate any of them!
+#
+# Upstream CI builds run from latest upstream main, and as such patches will 
not
+# apply due to fuzz, so skip all of them. Ensure all patches are always listed
+# inside the following if block.
 #
+%if %{without upstream}
 Patch:          0001-Drop-support-for-efivar-SystemdOptions.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
-
-%if %{without upstream}
 Patch:          0009-pid1-handle-console-specificities-weirdness-for-s390.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 for
-# very few cases, some stuff might be broken in upstream and need to be fixed 
or
-# worked around quickly. In these cases, the patches are added temporarily and
-# will be removed as soon as a proper fix will be merged by upstream.
+# The patches listed below are in quarantine. Normally, all changes must be
+# pushed to upstream first and then cherry-picked into the SUSE git
+# repository. However, in few cases, some issues might take too much time to be
+# solved by upstream. In these cases, these patches are temporarily added here
+# and will be removed as soon as a proper fix is merged by upstream.
 Patch:          5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch
 Patch:          5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch
 Patch:          5004-disable-session-freeze.patch
-Patch:          5005-Revert-boot-Make-initrd_prepare-semantically-equival.patch
-Patch:          5006-tpm2-util-Also-retry-unsealing-after-policy_pcr-retu.patch
 %endif
 
+# When building on OBS with version substitution, the version field will be 
updated, but not the intermediary
+# defines, so define systemd_major here after Version has been set, rather 
than using systemd_version, which
+# will be empty (and thus break files.systemd which uses it)
+%define systemd_major      %{sub %version 1 3}
+
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
 init scripts for Linux. systemd provides aggressive parallelization
@@ -616,7 +620,6 @@
 Requires:       lz4
 Requires:       make
 Requires:       mtools
-Requires:       netcat
 Requires:       python3-pexpect
 Requires:       qemu
 Requires:       quota
@@ -729,12 +732,15 @@
 %endif
 
 %prep
-%autosetup -p1 -n systemd-v%{version}%{archive_version}
+%autosetup -p1 -n systemd-%{version}%{archive_version}
 
 %build
 %meson \
         -Dmode=release \
         -Dversion-tag=%{version}%{archive_version} \
+%if %{with upstream}
+        -Dshared-lib-tag=%{systemd_major} \
+%endif
         -Ddocdir=%{_docdir}/systemd \
         -Dconfigfiledir=/usr/lib \
         -Dsplit-bin=true \
@@ -749,6 +755,7 @@
         -Ddefault-kill-user-processes=false \
         -Dpamconfdir=no \
         -Dpamlibdir=%{_pam_moduledir} \
+        -Dshellprofiledir=%{_distconfdir}/profile.d \
         -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
@@ -877,6 +884,11 @@
 %ifarch x86_64
 export BRP_PESIGN_FILES="%{_systemd_util_dir}/boot/efi/systemd-bootx64.efi"
 %endif
+%if %{with upstream}
+%ifarch aarch64
+export BRP_PESIGN_FILES="%{_systemd_util_dir}/boot/efi/systemd-bootaa64.efi"
+%endif
+%endif
 %endif
 
 # Don't ship resolvconf symlink for now as it conflicts with the binary shipped
@@ -1425,7 +1437,7 @@
 
 %if %{with testsuite}
 %files testsuite
-%doc %{_testsuitedir}/integration-tests/README.testsuite
+%doc %{_testsuitedir}/integration-tests/README.*
 %{_testsuitedir}
 %endif
 

++++++ 0001-Drop-support-for-efivar-SystemdOptions.patch ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.043703550 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.047703714 +0100
@@ -1,4 +1,4 @@
-From 72d766c5a17fc31902b367e949c4d90193f823b9 Mon Sep 17 00:00:00 2001
+From 91fa48c2d1aac250728379a0c0430f9f7a3c8351 Mon Sep 17 00:00:00 2001
 From: Franck Bui <f...@suse.com>
 Date: Fri, 22 Mar 2024 12:07:34 +0100
 Subject: [PATCH 1/1] Drop support for efivar SystemdOptions
@@ -11,15 +11,15 @@
 
 [fbui: fixes bsc#1220338]
 ---
- src/basic/efivars.c                    | 27 ++++++--------------------
- src/boot/bootctl-systemd-efi-options.c |  4 ++++
+ src/basic/efivars.c                       | 27 +++++------------------
+ src/bootctl/bootctl-systemd-efi-options.c |  4 ++++
  2 files changed, 10 insertions(+), 21 deletions(-)
 
 diff --git a/src/basic/efivars.c b/src/basic/efivars.c
-index 9011ae29a3..01ab7e5092 100644
+index 5e04c32212..78bdd28263 100644
 --- a/src/basic/efivars.c
 +++ b/src/basic/efivars.c
-@@ -351,29 +351,14 @@ SecureBootMode efi_get_secure_boot_mode(void) {
+@@ -368,29 +368,14 @@ SecureBootMode efi_get_secure_boot_mode(void) {
  }
  
  static int read_efi_options_variable(char **ret) {
@@ -36,7 +36,7 @@
 -                /* Let's be helpful with the returned error and check if the 
variable exists at all. If it
 -                 * does, let's return a recognizable error (EPERM), and if 
not ENODATA. */
 -
--                if (access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE(SystemdOptions)), 
F_OK) < 0)
+-                if 
(access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions")), F_OK) < 0)
 -                        return errno == ENOENT ? -ENODATA : -errno;
 -
 -                return -EPERM;
@@ -44,21 +44,21 @@
 +        /* For SUSE distros, support for SystemdOptions has already been 
dropped as it might be a security
 +         * concern for systems with unattended disk unlock and with disabled 
secure boot. */
  
--        r = efi_get_variable_string(EFI_SYSTEMD_VARIABLE(SystemdOptions), 
ret);
+-        r = 
efi_get_variable_string(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions"), ret);
 -        if (r == -ENOENT)
 -                return -ENODATA;
 -        return r;
-+        if (access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE(SystemdOptions)), F_OK) < 
0)
++        if (access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions")), 
F_OK) < 0)
 +                return errno == ENOENT ? -ENODATA : -errno;
 +
 +        return log_warning_errno(SYNTHETIC_ERRNO(EPERM), "Boot options passed 
via SystemdOptions EFI variable is no more supported, ignoring: %m");
  }
  
  int cache_efi_options_variable(void) {
-diff --git a/src/boot/bootctl-systemd-efi-options.c 
b/src/boot/bootctl-systemd-efi-options.c
-index 7f8308fc3d..216b99546f 100644
---- a/src/boot/bootctl-systemd-efi-options.c
-+++ b/src/boot/bootctl-systemd-efi-options.c
+diff --git a/src/bootctl/bootctl-systemd-efi-options.c 
b/src/bootctl/bootctl-systemd-efi-options.c
+index d626d87abc..32b79bd1e1 100644
+--- a/src/bootctl/bootctl-systemd-efi-options.c
++++ b/src/bootctl/bootctl-systemd-efi-options.c
 @@ -6,6 +6,7 @@
  #include "efi-loader.h"
  
@@ -76,6 +76,6 @@
 +#endif
  }
 -- 
-2.35.3
+2.43.0
 
 

++++++ 0009-pid1-handle-console-specificities-weirdness-for-s390.patch ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.063704368 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.071704696 +0100
@@ -1,7 +1,8 @@
-From 745ab2ac0f5424b0c04d9c38234bb9babcbd90ef Mon Sep 17 00:00:00 2001
+From b090866bc0e9192224acaeeec875ef4c8846b829 Mon Sep 17 00:00:00 2001
 From: Franck Bui <f...@suse.com>
 Date: Fri, 10 Jun 2016 15:19:57 +0200
-Subject: [PATCH] pid1: handle console specificities/weirdness for s390 arch
+Subject: [PATCH 1/1] pid1: handle console specificities/weirdness for s390
+ arch
 
 The 3270 console on S/390 can do color but not the 3215 console.
 
@@ -29,13 +30,13 @@
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
-index 3355b749cc..e96b053217 100644
+index 878c1ec06a..355ecdc45f 100644
 --- a/src/basic/terminal-util.c
 +++ b/src/basic/terminal-util.c
-@@ -784,7 +784,20 @@ bool tty_is_vc_resolve(const char *tty) {
+@@ -923,7 +923,20 @@ bool tty_is_vc_resolve(const char *tty) {
  }
  
- const char *default_term_for_tty(const char *tty) {
+ const char* default_term_for_tty(const char *tty) {
 -        return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220";
 +        if (tty && tty_is_vc_resolve(tty))
 +                return "linux";
@@ -55,6 +56,6 @@
  
  int fd_columns(int fd) {
 -- 
-2.35.3
+2.43.0
 
 

++++++ 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.087705350 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.091705514 +0100
@@ -1,4 +1,4 @@
-From d624ceb7f2e6e286cf876f2ff9bf90532166c7f9 Mon Sep 17 00:00:00 2001
+From f847d3d3b73c22c674bb713f179522cef8ddabb7 Mon Sep 17 00:00:00 2001
 From: Franck Bui <f...@suse.com>
 Date: Fri, 12 Jan 2024 10:54:57 +0100
 Subject: [PATCH 5001/5002] Revert "udev: update devlink with the newer device
@@ -10,10 +10,10 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
-index e12c26ce5a..6ba38087dc 100644
+index 673f723ff2..6e2fff72e9 100644
 --- a/src/udev/udev-node.c
 +++ b/src/udev/udev-node.c
-@@ -467,13 +467,13 @@ static int link_update(sd_device *dev, const char 
*slink, bool add) {
+@@ -457,13 +457,13 @@ static int link_update(sd_device *dev, const char 
*slink, bool add) {
                                  /* The devlink priority is downgraded. 
Another device may have a higher
                                   * priority now. Let's find the device node 
with the highest priority. */
                          } else {
@@ -29,10 +29,10 @@
 -                                 * create the devlink to our device node. */
 +                                /* This device has a higher priority than the 
current. Let's create the
 +                                 * devlink to our device node. */
-                                 return node_symlink(dev, NULL, slink);
+                                 return node_create_symlink(dev, /* devnode = 
*/ NULL, slink);
                          }
  
 -- 
-2.35.3
+2.43.0
 
 

++++++ 5004-disable-session-freeze.patch ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.107706168 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.111706332 +0100
@@ -1,4 +1,5 @@
-From: Michal Koutný <mkou...@suse.com>
+From 88d0e79a7e4de9df6460ed4af694f15caedc3014 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkou...@suse.com>
 Date: Wed, 24 Jul 2024 14:20:17 +0200
 Subject: Disable session freeze
 
@@ -9,22 +10,55 @@
 the breakage caused by cgroup freezing implementation.
 
 [1] https://github.com/systemd/systemd/issues/33083
+
+[fbui: rebased on top of v257]
 ---
- src/home/homework.c |    7 ++++---
- src/sleep/sleep.c   |    8 +++++---
+ src/home/homework.c | 7 ++++---
+ src/sleep/sleep.c   | 8 +++++---
  2 files changed, 9 insertions(+), 6 deletions(-)
 
+diff --git a/src/home/homework.c b/src/home/homework.c
+index 00e74894b3..d1de98e7b6 100644
+--- a/src/home/homework.c
++++ b/src/home/homework.c
+@@ -1880,7 +1880,7 @@ static int user_session_freezer_new(uid_t uid, 
UnitFreezer **ret) {
+         r = getenv_bool("SYSTEMD_HOME_LOCK_FREEZE_SESSION");
+         if (r < 0 && r != -ENXIO)
+                 log_warning_errno(r, "Cannot parse value of 
$SYSTEMD_HOME_LOCK_FREEZE_SESSION, ignoring: %m");
+-        else if (r == 0) {
++        else if (r == 0 || r == -ENXIO) { /* Do not freeze by default unless 
requested */
+                 *ret = NULL;
+                 return 0;
+         }
+@@ -1922,8 +1922,9 @@ static int home_lock(UserRecord *h) {
+                 if (r < 0)
+                         return r;
+         } else
+-                log_notice("Session remains unfrozen on explicit request 
($SYSTEMD_HOME_LOCK_FREEZE_SESSION=0).\n"
+-                           "This is not recommended, and might result in 
unexpected behavior including data loss!");
++                log_notice("Session remains unfrozen (add 
$SYSTEMD_HOME_LOCK_FREEZE_SESSION=1 to override).\n"
++                           "This is a temporary downstream workaround for 
https://github.com/systemd/systemd/issues/33083.\n";
++                           "Home locking is thus experimental and might 
result in unexpected behavior including data loss!");
+ 
+         r = home_lock_luks(h, &setup);
+         if (r < 0) {
+diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
+index 181bb4ccef..0181bcabc9 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
-@@ -603,12 +603,14 @@ static int run(int argc, char *argv[]) {
+@@ -612,6 +612,8 @@ static int run(int argc, char *argv[]) {
          r = getenv_bool("SYSTEMD_SLEEP_FREEZE_USER_SESSIONS");
          if (r < 0 && r != -ENXIO)
-                 log_warning_errno(r, "Cannot parse value of 
$SYSTEMD_SLEEP_FREEZE_USER_SESSIONS, ignoring.");
+                 log_warning_errno(r, "Cannot parse value of 
$SYSTEMD_SLEEP_FREEZE_USER_SESSIONS, ignoring: %m");
 +        if (r == -ENXIO)
 +                r = 0; /* Do not freeze by default unless requested */
-         if (r != 0)
-                 (void) unit_freezer_new_freeze(SPECIAL_USER_SLICE, 
&user_slice_freezer);
-         else
+         if (r != 0) {
+                 r = unit_freezer_new(SPECIAL_USER_SLICE, &user_slice_freezer);
+                 if (r < 0)
+@@ -619,9 +621,9 @@ static int run(int argc, char *argv[]) {
+ 
+                 (void) unit_freezer_freeze(user_slice_freezer);
+         } else
 -                log_notice("User sessions remain unfrozen on explicit request 
($SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=0).\n"
 -                           "This is not recommended, and might result in 
unexpected behavior, particularly\n"
 -                           "in suspend-then-hibernate operations or setups 
with encrypted home directories.");
@@ -34,21 +68,7 @@
  
          switch (arg_operation) {
  
---- a/src/home/homework.c
-+++ b/src/home/homework.c
-@@ -1879,10 +1879,11 @@ static int user_session_freezer(uid_t ui
-         r = getenv_bool("SYSTEMD_HOME_LOCK_FREEZE_SESSION");
-         if (r < 0 && r != -ENXIO)
-                 log_warning_errno(r, "Cannot parse value of 
$SYSTEMD_HOME_LOCK_FREEZE_SESSION, ignoring: %m");
--        else if (r == 0) {
-+        else if (r == 0 || r == -ENXIO) { /* Do not freeze by default unless 
requested */
-                 if (freeze_now)
--                        log_notice("Session remains unfrozen on explicit 
request ($SYSTEMD_HOME_LOCK_FREEZE_SESSION=0).\n"
--                                   "This is not recommended, and might result 
in unexpected behavior including data loss!");
-+                        log_notice("Session remains unfrozen (add 
$SYSTEMD_HOME_LOCK_FREEZE_SESSION=1 to override).\n"
-+                                   "This is a temporary downstream workaround 
for https://github.com/systemd/systemd/issues/33083.\n";
-+                                   "Home locking is thus experimental and 
might result in unexpected behavior including data loss!");
- 
-                 *ret = NULL;
-                 return 0;
+-- 
+2.43.0
+
 

++++++ _service ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.147707804 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.151707968 +0100
@@ -1,17 +1,16 @@
-<!-- See https://en.opensuse.org/openSUSE:Build_Service_Concept_SourceService 
-->
-<!-- for more details on the syntax -->
+<!-- for more details on the syntax, see: -->
+<!--    https://en.opensuse.org/openSUSE:Build_Service_Concept_SourceService 
-->
+<!--    
https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.service.in 
-->
+<!--    
https://github.com/openSUSE/obs-service-tar_scm?tab=readme-ov-file#services -->
 
 <services>
-       <service name="tar_scm" mode="disabled">
-               <param name="scm">git</param>
-               <param 
name="url">https://github.com/openSUSE/systemd.git</param>
-               <param name="filename">systemd</param>
-               <param 
name="versionformat">@PARENT_TAG@+suse.@TAG_OFFSET@.g%h</param>
-               <param name="revision">openSUSE-Factory</param>
-       </service>
-       <service name="recompress" mode="disabled">
-                <param name="file">*systemd-v243+suse.*.tar</param>
-                <param name="compression">xz</param>
-       </service>
+  <service name="obs_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/openSUSE/systemd.git</param>
+    <param name="filename">systemd</param>
+    <param name="versionformat">@PARENT_TAG@+suse.@TAG_OFFSET@.g%h</param>
+    <param name="revision">openSUSE-Factory</param>
+  </service>
+  <service name="tar" mode="disabled"/>
 </services>
 

++++++ files.container ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.191709604 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.195709767 +0100
@@ -5,9 +5,7 @@
 %{_bindir}/systemd-nspawn
 %if %{without bootstrap}
 %{_datadir}/bash-completion/completions/systemd-nspawn
-%endif
 %{_datadir}/polkit-1/actions/io.systemd.mount-file-system.policy
-%if %{without bootstrap}
 %{_datadir}/zsh/site-functions/_systemd-nspawn
 %{_mandir}/man1/systemd-nspawn.1.gz
 %{_mandir}/man5/systemd.nspawn.5.gz
@@ -81,13 +79,17 @@
 %{_mandir}/man5/org.freedesktop.import1.5.gz
 %{_mandir}/man8/systemd-importd.8.gz
 %{_mandir}/man8/systemd-importd.service.8.gz
+%{_mandir}/man8/systemd-import-generator.8.gz
 %{_systemd_util_dir}/import-pubring.gpg
 %{_systemd_util_dir}/systemd-export
 %{_systemd_util_dir}/systemd-import
 %{_systemd_util_dir}/systemd-import-fs
 %{_systemd_util_dir}/systemd-importd
 %{_systemd_util_dir}/systemd-pull
+%{_systemdgeneratordir}/systemd-import-generator
 %{_unitdir}/dbus-org.freedesktop.import1.service
+%{_unitdir}/sockets.target.wants/systemd-importd.socket
 %{_unitdir}/systemd-importd.service
+%{_unitdir}/systemd-importd.socket
 %endif
 

++++++ files.devel-doc ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.235711404 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.243711731 +0100
@@ -120,7 +120,9 @@
 %{_mandir}/man3/sd-hwdb.3.gz
 %{_mandir}/man3/sd-id128.3.gz
 %{_mandir}/man3/sd-journal.3.gz
+%{_mandir}/man3/sd-json.3.gz
 %{_mandir}/man3/sd-login.3.gz
+%{_mandir}/man3/sd-varlink.3.gz
 %{_mandir}/man3/sd_booted.3.gz
 %{_mandir}/man3/sd_bus_add_fallback.3.gz
 %{_mandir}/man3/sd_bus_add_fallback_vtable.3.gz
@@ -357,6 +359,7 @@
 %{_mandir}/man3/sd_bus_path_decode_many.3.gz
 %{_mandir}/man3/sd_bus_path_encode.3.gz
 %{_mandir}/man3/sd_bus_path_encode_many.3.gz
+%{_mandir}/man3/sd_bus_pending_method_calls.3.gz
 %{_mandir}/man3/sd_bus_process.3.gz
 %{_mandir}/man3/sd_bus_query_sender_creds.3.gz
 %{_mandir}/man3/sd_bus_query_sender_privilege.3.gz
@@ -434,12 +437,14 @@
 %{_mandir}/man3/sd_bus_unref.3.gz
 %{_mandir}/man3/sd_bus_unrefp.3.gz
 %{_mandir}/man3/sd_bus_wait.3.gz
+%{_mandir}/man3/sd_device_get_device_id.3.gz
 %{_mandir}/man3/sd_device_get_devname.3.gz
 %{_mandir}/man3/sd_device_get_devnum.3.gz
 %{_mandir}/man3/sd_device_get_devpath.3.gz
 %{_mandir}/man3/sd_device_get_devtype.3.gz
 %{_mandir}/man3/sd_device_get_diskseq.3.gz
 %{_mandir}/man3/sd_device_get_driver.3.gz
+%{_mandir}/man3/sd_device_get_driver_subsystem.3.gz
 %{_mandir}/man3/sd_device_get_ifindex.3.gz
 %{_mandir}/man3/sd_device_get_subsystem.3.gz
 %{_mandir}/man3/sd_device_get_sysname.3.gz

++++++ files.experimental ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.267712713 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.275713040 +0100
@@ -1,6 +1,10 @@
 #
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
+
+# the ssh proxy will likely be promoted to systemd-container
+%dir %{_distconfdir}/ssh
+%dir %{_distconfdir}/ssh/ssh_config.d
 %dir %{_prefix}/lib/pcrlock.d
 %dir %{_prefix}/lib/pcrlock.d/400-secureboot-separator.pcrlock.d
 %dir %{_prefix}/lib/pcrlock.d/500-separator.pcrlock.d
@@ -13,6 +17,9 @@
 %ghost %{_sysconfdir}/systemd/oomd.conf
 %{_bindir}/oomctl
 %{_bindir}/run0
+%if %{with upstream}
+%{_bindir}/systemd-pty-forward
+%endif
 %{_bindir}/systemd-vmspawn
 %if %{with sd_boot}
 %{_bindir}/ukify
@@ -27,9 +34,16 @@
 %{_datadir}/dbus-1/system.d/org.freedesktop.oom1.conf
 %{_datadir}/zsh/site-functions/_oomctl
 %{_datadir}/zsh/site-functions/_run0
+%{_distconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
 %{_mandir}/man1/oomctl.1.gz
 %{_mandir}/man1/run0.1.gz
+%{_mandir}/man1/systemd-keyutil.1.gz
 %{_mandir}/man1/systemd-measure.1.gz
+%if %{with upstream}
+%{_mandir}/man1/systemd-pty-forward.1.gz
+%endif
+%{_mandir}/man1/systemd-sbsign.1.gz
+%{_mandir}/man1/systemd-ssh-proxy.1.gz
 %{_mandir}/man1/systemd-vmspawn.1.gz
 %if %{with sd_boot}
 %{_mandir}/man1/ukify.1.gz
@@ -40,6 +54,7 @@
 %{_mandir}/man5/systemd.pcrlock.5.gz
 %{_mandir}/man5/systemd.pcrlock.d.5.gz
 %{_mandir}/man5/sysupdate.d.5.gz
+%{_mandir}/man5/sysupdate.features.5.gz
 %{_mandir}/man8/systemd-bsod.8.gz
 %{_mandir}/man8/systemd-bsod.service.8.gz
 %{_mandir}/man8/systemd-oomd.8.gz
@@ -61,6 +76,7 @@
 %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz
 %{_mandir}/man8/systemd-pcrphase.service.8.gz
 %endif
+%{_mandir}/man8/systemd-ssh-generator.8.gz
 %{_mandir}/man8/systemd-storagetm.8.gz
 %{_mandir}/man8/systemd-storagetm.service.8.gz
 %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz
@@ -73,9 +89,12 @@
 %{_mandir}/man8/systemd-tpm2-setup-early.service.8.gz
 %{_mandir}/man8/systemd-tpm2-setup.8.gz
 %{_mandir}/man8/systemd-tpm2-setup.service.8.gz
-%{_prefix}/lib/kernel/install.d/60-ukify.install
 %endif
 %{_pam_vendordir}/systemd-run0
+%if %{with sd_boot}
+%{_prefix}/lib/kernel/install.d/60-ukify.install
+%endif
+%{_prefix}/lib/kernel/uki.conf
 %{_prefix}/lib/pcrlock.d/350-action-efi-application.pcrlock
 
%{_prefix}/lib/pcrlock.d/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock
 
%{_prefix}/lib/pcrlock.d/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock
@@ -91,12 +110,15 @@
 %{_prefix}/lib/pcrlock.d/990-final.pcrlock
 %{_systemd_util_dir}/oomd.conf
 %{_systemd_util_dir}/systemd-bsod
+%{_systemd_util_dir}/systemd-keyutil
 %{_systemd_util_dir}/systemd-measure
 %{_systemd_util_dir}/systemd-oomd
 %if %{with sd_boot}
 %{_systemd_util_dir}/systemd-pcrextend
 %endif
 %{_systemd_util_dir}/systemd-pcrlock
+%{_systemd_util_dir}/systemd-sbsign
+%{_systemd_util_dir}/systemd-ssh-proxy
 %{_systemd_util_dir}/systemd-storagetm
 %{_systemd_util_dir}/systemd-sysupdate
 %if %{with sd_boot}
@@ -106,6 +128,8 @@
 %if %{with sd_boot}
 %{_systemd_util_dir}/ukify
 %endif
+# ssh-generator: in the futur to be moved to the main package
+%{_systemdgeneratordir}/systemd-ssh-generator
 %{_systemdgeneratordir}/systemd-tpm2-generator
 %{_sysusersdir}/systemd-oom.conf
 %{_unitdir}/initrd.target.wants/systemd-bsod.service
@@ -155,17 +179,3 @@
 %endif
 %{_unitdir}/systemd-vmspawn@.service
 
-# ssh-generator: in the futur to be moved to the main package
-%{_systemdgeneratordir}/systemd-ssh-generator
-%if %{without bootstrap}
-%{_mandir}/man8/systemd-ssh-generator.8.gz
-%endif
-# the ssh proxy will likely be promoted to systemd-container
-%dir %{_distconfdir}/ssh
-%dir %{_distconfdir}/ssh/ssh_config.d
-%{_distconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
-%{_systemd_util_dir}/systemd-ssh-proxy
-%if %{without bootstrap}
-%{_mandir}/man1/systemd-ssh-proxy.1.gz
-%endif
-

++++++ files.systemd ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.367716803 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.375717130 +0100
@@ -2,6 +2,7 @@
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
 
+
 %dir %{_binfmtdir}
 %if %{without bootstrap}
 %dir %{_datadir}/bash-completion
@@ -164,6 +165,9 @@
 %{_datadir}/bash-completion/completions/systemd-sysext
 %{_datadir}/bash-completion/completions/systemd-vpick
 %{_datadir}/bash-completion/completions/timedatectl
+%if %{with upstream}
+%{_datadir}/bash-completion/completions/userdbctl
+%endif
 %endif
 # dbus introspection data for code generators: 
https://github.com/systemd/systemd/pull/20294
 %{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
@@ -229,6 +233,9 @@
 %{_datadir}/zsh/site-functions/_systemd-tmpfiles
 %{_datadir}/zsh/site-functions/_timedatectl
 %{_datadir}/zsh/site-functions/_varlinkctl
+%endif
+%{_distconfdir}/profile.d/70-systemd-shell-extra.sh
+%if %{without bootstrap}
 %{_journalcatalogdir}/systemd.catalog
 %{_libdir}/libnss_myhostname.so.2
 %{_libdir}/libnss_systemd.so.2
@@ -368,6 +375,9 @@
 %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz
 %{_mandir}/man8/systemd-confext.8.gz
 %{_mandir}/man8/systemd-confext.service.8.gz
+%if %{with upstream}
+%{_mandir}/man8/systemd-confext-initrd.service.8.gz
+%endif
 %{_mandir}/man8/systemd-coredump.8.gz
 %{_mandir}/man8/systemd-coredump.socket.8.gz
 %{_mandir}/man8/systemd-cored...@.service.8.gz
@@ -402,6 +412,9 @@
 %{_mandir}/man8/systemd-sysctl.service.8.gz
 %{_mandir}/man8/systemd-sysext.8.gz
 %{_mandir}/man8/systemd-sysext.service.8.gz
+%if %{with upstream}
+%{_mandir}/man8/systemd-sysext-initrd.service.8.gz
+%endif
 %{_mandir}/man8/systemd-system-update-generator.8.gz
 %{_mandir}/man8/systemd-sysusers.8.gz
 %{_mandir}/man8/systemd-sysusers.service.8.gz
@@ -497,7 +510,14 @@
 %{_systemd_util_dir}/user/shutdown.target
 %{_systemd_util_dir}/user/smartcard.target
 %{_systemd_util_dir}/user/sockets.target
+%if %{with upstream}
+%{_systemd_util_dir}/user/sockets.target.wants/systemd-ask-password.socket
+%endif
 %{_systemd_util_dir}/user/sound.target
+%if %{with upstream}
+%{_systemd_util_dir}/user/systemd-ask-password.socket
+%{_systemd_util_dir}/user/systemd-ask-password@.service
+%endif
 %{_systemd_util_dir}/user/systemd-exit.service
 %{_systemd_util_dir}/user/systemd-tmpfiles-clean.service
 %{_systemd_util_dir}/user/systemd-tmpfiles-clean.timer
@@ -530,6 +550,12 @@
 %{_unitdir}/blockdev@.target
 %{_unitdir}/bluetooth.target
 %{_unitdir}/boot-complete.target
+%if %{with upstream}
+%{_unitdir}/breakpoint-pre-basic.service
+%{_unitdir}/breakpoint-pre-mount.service
+%{_unitdir}/breakpoint-pre-switch-root.service
+%{_unitdir}/breakpoint-pre-udev.service
+%endif
 %{_unitdir}/capsule.slice
 %{_unitdir}/capsule@.service
 %{_unitdir}/console-getty.service
@@ -563,6 +589,10 @@
 %{_unitdir}/initrd-switch-root.target
 %{_unitdir}/initrd-usr-fs.target
 %{_unitdir}/initrd.target
+%if %{with upstream}
+%{_unitdir}/initrd.target.wants/systemd-confext-initrd.service
+%{_unitdir}/initrd.target.wants/systemd-sysext-initrd.service
+%endif
 %{_unitdir}/kexec.target
 %{_unitdir}/local-fs-pre.target
 %{_unitdir}/local-fs.target
@@ -594,6 +624,9 @@
 %{_unitdir}/slices.target
 %{_unitdir}/smartcard.target
 %{_unitdir}/sockets.target
+%if %{with upstream}
+%{_unitdir}/sockets.target.wants/systemd-ask-password.socket
+%endif
 %if %{without bootstrap}
 %{_unitdir}/sockets.target.wants/systemd-coredump.socket
 %endif
@@ -640,9 +673,16 @@
 %{_unitdir}/systemd-ask-password-console.service
 %{_unitdir}/systemd-ask-password-wall.path
 %{_unitdir}/systemd-ask-password-wall.service
+%if %{with upstream}
+%{_unitdir}/systemd-ask-password.socket
+%{_unitdir}/systemd-ask-password@.service
+%endif
 %{_unitdir}/systemd-binfmt.service
 %{_unitdir}/systemd-boot-check-no-failures.service
 %{_unitdir}/systemd-confext.service
+%if %{with upstream}
+%{_unitdir}/systemd-confext-initrd.service
+%endif
 %if %{without bootstrap}
 %{_unitdir}/systemd-coredump.socket
 %{_unitdir}/systemd-coredump@.service
@@ -674,6 +714,9 @@
 %{_unitdir}/systemd-sysext.service
 %{_unitdir}/systemd-sysext.socket
 %{_unitdir}/systemd-sysext@.service
+%if %{with upstream}
+%{_unitdir}/systemd-sysext-initrd.service
+%endif
 %{_unitdir}/systemd-sysusers.service
 %{_unitdir}/systemd-time-wait-sync.service
 %{_unitdir}/systemd-timedated.service

++++++ files.udev ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.411718603 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.415718766 +0100
@@ -79,6 +79,7 @@
 %{_mandir}/man5/integritytab.5.gz
 %{_mandir}/man5/iocost.conf.5.gz
 %{_mandir}/man5/modules-load.d.5.gz
+%{_mandir}/man5/org.freedesktop.timesync1.5.gz
 %{_mandir}/man5/pstore.conf.5.gz
 %{_mandir}/man5/pstore.conf.d.5.gz
 %{_mandir}/man5/repart.d.5.gz
@@ -150,6 +151,9 @@
 %{_mandir}/man8/systemd-udev-settle.service.8.gz
 %{_mandir}/man8/systemd-udevd-control.socket.8.gz
 %{_mandir}/man8/systemd-udevd-kernel.socket.8.gz
+%if %{with upstream}
+%{_mandir}/man8/systemd-udevd-varlink.socket.8.gz
+%endif
 %{_mandir}/man8/systemd-udevd.8.gz
 %{_mandir}/man8/systemd-udevd.service.8.gz
 %{_mandir}/man8/systemd-vconsole-setup.8.gz
@@ -167,7 +171,7 @@
 %endif
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
-%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips
+%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips riscv64
 # dmi_memory_id is only relevant on arches with DMI
 %{_prefix}/lib/udev/dmi_memory_id
 %endif
@@ -292,7 +296,7 @@
 %{_udevrulesdir}/64-btrfs.rules
 %{_udevrulesdir}/70-camera.rules
 %{_udevrulesdir}/70-joystick.rules
-%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips
+%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips riscv64
 %{_udevrulesdir}/70-memory.rules
 %endif
 %{_udevrulesdir}/70-mouse.rules
@@ -305,6 +309,9 @@
 %{_udevrulesdir}/80-drivers.rules
 %endif
 %{_udevrulesdir}/80-net-setup-link.rules
+%if %{with upstream}
+%{_udevrulesdir}/81-net-bridge.rules
+%endif
 %{_udevrulesdir}/81-net-dhcp.rules
 %{_udevrulesdir}/90-iocost.rules
 %{_udevrulesdir}/90-vconsole.rules
@@ -337,6 +344,9 @@
 %endif
 %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket
 %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket
+%if %{with upstream}
+%{_unitdir}/sockets.target.wants/systemd-udevd-varlink.socket
+%endif
 %{_unitdir}/suspend-then-hibernate.target
 %{_unitdir}/suspend.target
 %if %{without bootstrap}
@@ -404,6 +414,9 @@
 %{_unitdir}/systemd-udevd-control.socket
 %{_unitdir}/systemd-udevd-kernel.socket
 %{_unitdir}/systemd-udevd.service
+%if %{with upstream}
+%{_unitdir}/systemd-udevd-varlink.socket
+%endif
 %{_unitdir}/systemd-vconsole-setup.service
 %{_unitdir}/systemd-volatile-root.service
 %{_unitdir}/tpm2.target

++++++ files.uefi-boot ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.443719912 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.443719912 +0100
@@ -23,6 +23,7 @@
 %{_systemd_util_dir}/boot/efi/systemd-boot*.efi
 %{_systemd_util_dir}/systemd-bless-boot
 %{_systemdgeneratordir}/systemd-bless-boot-generator
+%{_tmpfilesdir}/20-systemd-stub.conf
 %{_unitdir}/sysinit.target.wants/systemd-boot-random-seed.service
 %{_unitdir}/systemd-bless-boot.service
 %{_unitdir}/systemd-boot-random-seed.service

++++++ systemd-v256.10+suse.13.gf962392e1e.tar.xz -> systemd-257.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/systemd/systemd-v256.10+suse.13.gf962392e1e.tar.xz 
/work/SRC/openSUSE:Factory/.systemd.new.2316/systemd-257.2.tar.xz differ: char 
26, line 1

++++++ systemd-update-helper ++++++
--- /var/tmp/diff_new_pack.Bb4QGI/_old  2025-01-25 19:10:28.563724820 +0100
+++ /var/tmp/diff_new_pack.Bb4QGI/_new  2025-01-25 19:10:28.563724820 +0100
@@ -12,6 +12,8 @@
 
 command -v systemctl >/dev/null || exit 0
 
+UPDATE_HELPER_USER_TIMEOUT_SEC=15
+
 case "$command" in
     mark-install-system-units)
         mkdir -p /run/systemd/rpm/needs-preset
@@ -76,7 +78,7 @@
 
         users=$(systemctl list-units 'user@*' --legend=no | sed -n -r 
's/.*user@([0-9]+).service.*/\1/p')
         for user in $users; do
-            SYSTEMD_BUS_TIMEOUT=15s \
+            SYSTEMD_BUS_TIMEOUT=${UPDATE_HELPER_USER_TIMEOUT_SEC}s \
                     systemctl --user -M "$user@" disable --now --no-warn "$@" &
         done
         wait
@@ -97,7 +99,7 @@
         users=$(systemctl list-units 'user@*' --legend=no | sed -n -r 
's/.*user@([0-9]+).service.*/\1/p')
         for user in $users; do
             for unit in "$@"; do
-                SYSTEMD_BUS_TIMEOUT=15s \
+                SYSTEMD_BUS_TIMEOUT=${UPDATE_HELPER_USER_TIMEOUT_SEC}s \
                         systemctl --user -M "$user@" set-property "$unit" 
Markers=+needs-restart &
             done
         done
@@ -121,7 +123,7 @@
         fi
         ;;
 
-    user-reexec)
+    user-reload-restart|user-reload|user-restart|user-reexec)
         if [ -n "$*" ]; then
             echo >&2 "Unexpected arguments for '$command': $*"
             exit 2
@@ -129,36 +131,15 @@
 
         [ -d /run/systemd/system ] || exit 0
 
-        # Reexecute user manager instances (if any). It is asynchronous but it
-        # shouldn't be a problem in practice because systemd main package is 
not
-        # shipping any user services currently. A problem would arise only if a
-        # new version of a user service relied on an option that would be only
-        # understood by the latest version of the user manager and the user 
unit
-        # would be restarted before the user manager get reexecuted.
-        systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service"
-        ;;
-
-    user-reload-restart|user-reload|user-restart)
-        if [ -n "$*" ]; then
-            echo >&2 "Unexpected arguments for '$command': $*"
-            exit 2
-        fi
-
-        [ -d /run/systemd/system ] || exit 0
-
-        users=$(systemctl list-units 'user@*' --legend=no | sed -n -r 
's/.*user@([0-9]+).service.*/\1/p')
-
-        if [[ "$command" =~ reload ]]; then
-            for user in $users; do
-                SYSTEMD_BUS_TIMEOUT=15s \
-                        systemctl --user -M "$user@" daemon-reload &
-            done
-            wait
+        if [[ "$command" =~ reexec|reload ]]; then
+            SYSTEMD_BUS_TIMEOUT=${UPDATE_HELPER_USER_TIMEOUT_SEC}s systemctl 
reload "user@*.service"
         fi
 
         if [[ "$command" =~ restart ]]; then
+            users=$(systemctl list-units 'user@*' --legend=no | sed -n -r 
's/.*user@([0-9]+).service.*/\1/p')
+
             for user in $users; do
-                SYSTEMD_BUS_TIMEOUT=15s \
+                SYSTEMD_BUS_TIMEOUT=${UPDATE_HELPER_USER_TIMEOUT_SEC}s \
                         systemctl --user -M "$user@" reload-or-restart 
--marked &
             done
             wait

Reply via email to