Accepting request 519864 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/519864
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=260

0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch

@@ -0,0 +1,48 @@
+From 02a4361a931a210b547795a49d062e90d2462cbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>
+Date: Wed, 23 Aug 2017 15:18:19 +0200
+Subject: [PATCH 1/1] Revert "core/device: Use JobRunningTimeoutSec= for device
+ units"
+
+This reverts commit d9732d78034cd01a75f2cda6ebaddb4c3a0929ea.
+
+This is not backwards compatible for outer callers that are used to set
+JobTimeoutSec= for devices. The compatibility breaks if JobTimeoutSec= is
+longer than default JobRunningTimeoutSec=90, especially JobTimeoutSec=infinity.
+
+[mkoutny: fixes bsc#1048605]
+[fbui: as a consequence, reintroduces bsc#1004995]
+---
+ src/core/device.c      | 2 +-
+ src/shared/generator.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index 434a6a9c5..89549f43b 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -114,7 +114,7 @@ static void device_init(Unit *u) {
+          * indefinitely for plugged in devices, something which cannot
+          * happen for the other units since their operations time out
+          * anyway. */
+-        u->job_running_timeout = u->manager->default_timeout_start_usec;
++        u->job_timeout = u->manager->default_timeout_start_usec;
+ 
+         u->ignore_on_isolate = true;
+ }
+diff --git a/src/shared/generator.c b/src/shared/generator.c
+index 47be354ba..743bc88f6 100644
+--- a/src/shared/generator.c
++++ b/src/shared/generator.c
+@@ -187,7 +187,7 @@ int generator_write_timeouts(
+ 
+         return write_drop_in_format(dir, unit, 50, "device-timeout",
+                                     "# Automatically generated by %s\n\n"
+-                                    "[Unit]\nJobRunningTimeoutSec=%s",
++                                    "[Unit]\nJobTimeoutSec=%s",
+                                     program_invocation_short_name, timeout);
+ }
+ 
+-- 
+2.13.1
+

systemd-234.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1
+oid sha256:ca0e6e98e69ba6a809d145ac5562f594c86acce052fbfbbf291fa61e9b8352a2
-size 3350088
+size 3351252

systemd-mini.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com
+
+- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605)
+
+  It's a temporary but urgent fix for a regression discovered in bug
+  1048605. The fix is still under discussion with upstream but we need
+  to make progress here and limit the number of affected users.
+
+  Consequently this fix reintroduces bsc#1004995 (the bug report has
+  been re-opened) but this one is far less critical and a workaround
+  was provided.
+
+  The final solution will fix both bugs.
+
+-------------------------------------------------------------------
+Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com
+
+- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1
+
+  7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268)
+
+-------------------------------------------------------------------
+Tue Aug  1 13:39:41 UTC 2017 - fbui@suse.com
+
+- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section
+
 -------------------------------------------------------------------
 Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com
 

systemd-mini.spec

@@ -162,6 +162,7 @@ Source1065:     udev-remount-tmpfs
 # patches are temporary and should be removed as soon as a fix is
 # merged by upstream.
 Patch1:         0001-core-disable-session-keyring-per-system-sevice-entir.patch
+Patch2:         0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -765,8 +766,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
 end
 
 %pre -n udev%{?mini}
-%regenerate_initrd_post
-
 if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then
         rm /usr/lib/udev
         mv /lib/udev /usr/lib
@@ -784,6 +783,7 @@ if [ $1 -eq 1 ]; then
 fi
 
 %post -n udev%{?mini}
+%regenerate_initrd_post
 %udev_hwdb_update
 
 # add KERNEL name match to existing persistent net rules

systemd.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com
+
+- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605)
+
+  It's a temporary but urgent fix for a regression discovered in bug
+  1048605. The fix is still under discussion with upstream but we need
+  to make progress here and limit the number of affected users.
+
+  Consequently this fix reintroduces bsc#1004995 (the bug report has
+  been re-opened) but this one is far less critical and a workaround
+  was provided.
+
+  The final solution will fix both bugs.
+
+-------------------------------------------------------------------
+Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com
+
+- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1
+
+  7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268)
+
+-------------------------------------------------------------------
+Tue Aug  1 13:39:41 UTC 2017 - fbui@suse.com
+
+- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section
+
 -------------------------------------------------------------------
 Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com
 

systemd.spec

@@ -160,6 +160,7 @@ Source1065:     udev-remount-tmpfs
 # patches are temporary and should be removed as soon as a fix is
 # merged by upstream.
 Patch1:         0001-core-disable-session-keyring-per-system-sevice-entir.patch
+Patch2:         0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -763,8 +764,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
 end
 
 %pre -n udev%{?mini}
-%regenerate_initrd_post
-
 if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then
         rm /usr/lib/udev
         mv /lib/udev /usr/lib
@@ -782,6 +781,7 @@ if [ $1 -eq 1 ]; then
 fi
 
 %post -n udev%{?mini}
+%regenerate_initrd_post
 %udev_hwdb_update
 
 # add KERNEL name match to existing persistent net rules