pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 532104 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/532104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=263
This commit is contained in:
Dominique Leuenberger 2017-10-10 09:37:40 +00:00 committed by Git OBS Bridge
commit fddba7a73b
6 changed files with 64 additions and 52 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
View File

@ -1,48 +0,0 @@
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

4
systemd-234.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ee3972f4e9cb106edc944878ffd753b55e3318efad555bf06c8e66770e7605e
size 3351148
oid sha256:6fd8f4674008055ae6b3fb870e84fbd64f53c1edaf43c84d95d7a9b6b7bec00b
size 3351212

31
systemd-mini.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com
- Damn forgot to drop 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch in
the spec file
-------------------------------------------------------------------
Fri Oct 6 07:30:01 UTC 2017 - fbui@suse.com
- Import commit 6dea894131d78b20b9e0482f75afa6ee4dec8627
1cdd944b0 unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too (bsc#1004995)
This make 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch
not needed anymore.
-------------------------------------------------------------------
Thu Oct 5 12:24:35 UTC 2017 - fbui@suse.com
- Import commit 93688f8e53b4e482a55a7d4aba2d927ddedebdde
c53522be3 compat-rules: allow to specify the generation number through the kernel cmdline
-------------------------------------------------------------------
Wed Oct 4 15:44:14 UTC 2017 - fbui@suse.com
- Import commit c1e8af7d1e8b09c2878a5b17f513bfc41ae46dc6
982754275 build-sys: make sure 61-persitent-storage-compat.rules is installed with meson
9ac2e8b9b udev: proc_cmdline_get_key() FTW! (#6925)
-------------------------------------------------------------------
Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com

1
systemd-mini.spec
View File

@ -163,7 +163,6 @@ 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

31
systemd.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com
- Damn forgot to drop 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch in
the spec file
-------------------------------------------------------------------
Fri Oct 6 07:30:01 UTC 2017 - fbui@suse.com
- Import commit 6dea894131d78b20b9e0482f75afa6ee4dec8627
1cdd944b0 unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too (bsc#1004995)
This make 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch
not needed anymore.
-------------------------------------------------------------------
Thu Oct 5 12:24:35 UTC 2017 - fbui@suse.com
- Import commit 93688f8e53b4e482a55a7d4aba2d927ddedebdde
c53522be3 compat-rules: allow to specify the generation number through the kernel cmdline
-------------------------------------------------------------------
Wed Oct 4 15:44:14 UTC 2017 - fbui@suse.com
- Import commit c1e8af7d1e8b09c2878a5b17f513bfc41ae46dc6
982754275 build-sys: make sure 61-persitent-storage-compat.rules is installed with meson
9ac2e8b9b udev: proc_cmdline_get_key() FTW! (#6925)
-------------------------------------------------------------------
Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com

1
systemd.spec
View File

@ -161,7 +161,6 @@ 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