core/device: Use JobRunningTimeoutSec= for device units

Device job timeouts should respect possible device job dependencies so we set
JobRunningTimeoutSec= by default.

diff --git a/src/core/device.c b/src/core/device.c
index 0e67c96552eac9cb6e29fcf906d2b88a09df0504..da008f604148850e7bf8ae5f767d11a919f272b5 100644 (file)
--- 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 5f6b1de811ae40592fe34e69f32bc24809af81bc..19ec133772d91247c7f42e11c0922d728588210e 100644 (file)
--- 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);
 }