From d9732d78034cd01a75f2cda6ebaddb4c3a0929ea Mon Sep 17 00:00:00 2001 From: Michal Koutný Date: Wed, 5 Apr 2017 14:11:12 +0200 Subject: core/device: Use JobRunningTimeoutSec= for device units Device job timeouts should respect possible device job dependencies so we set JobRunningTimeoutSec= by default. --- src/core/device.c | 2 +- src/shared/generator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/core/device.c b/src/core/device.c index 0e67c96552..da008f6041 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -112,7 +112,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_timeout = u->manager->default_timeout_start_usec; + u->job_running_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 5f6b1de811..19ec133772 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -188,7 +188,7 @@ int generator_write_timeouts( return write_drop_in_format(dir, unit, 50, "device-timeout", "# Automatically generated by %s\n\n" - "[Unit]\nJobTimeoutSec=%s", + "[Unit]\nJobRunningTimeoutSec=%s", program_invocation_short_name, timeout); } -- cgit v1.2.3-54-g00ecf