rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 519863 from home:fbui:systemd:Factory

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

OBS-URL: https://build.opensuse.org/request/show/519863
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=987
This commit is contained in:
Franck Bui 2017-08-31 07:20:04 +00:00 committed by Git OBS Bridge
parent 55c7f080ed
commit ba246b36a2
5 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch Normal file
View File

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

15
systemd-mini.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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

1
systemd-mini.spec
View File

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

15
systemd.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
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

1
systemd.spec
View File

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