diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-22 23:16:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 23:16:11 -0400 |
| commit | 7d78f7cea82dc7b4ced77f86a05124add2509390 (patch) | |
| tree | b0086c9c7ae73a86bcb619d27dc651c04aaa50f9 /src/core/job.c | |
| parent | 94fce754b1248e4f174054b184e1078a593e1941 (diff) | |
| parent | ae8c7939df962cbf660b2b9517fe46be272f58b9 (diff) | |
Merge pull request #4428 from lnykryn/ctrl_v2
rename failure-action to emergency-action and use it for ctrl+alt+del burst
Diffstat (limited to 'src/core/job.c')
| -rw-r--r-- | src/core/job.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/job.c b/src/core/job.c index 7faf2ef686..3ecc8a1a73 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -927,7 +927,7 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user u = j->unit; job_finish_and_invalidate(j, JOB_TIMEOUT, true, false); - failure_action(u->manager, u->job_timeout_action, u->job_timeout_reboot_arg); + emergency_action(u->manager, u->job_timeout_action, u->job_timeout_reboot_arg, "job timed out"); return 0; } |