picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core/device: Use JobRunningTimeoutSec= for device units 

Device job timeouts should respect possible device job dependencies so we set
JobRunningTimeoutSec= by default.
This commit is contained in:
Michal Koutný 2017-04-05 14:11:12 +02:00
parent 4195077ab4
commit d9732d7803
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/device.c
View File

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

2
src/shared/generator.c
View File

@ -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);
}