diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-01-28 12:03:23 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-01-28 12:03:23 +0100 |
| commit | 28c758de94bc8ba97b89d9dab3f517cf466978d0 (patch) | |
| tree | 198f5c2ac9759206a6a6683e72e00771c6607198 /src/core/job.c | |
| parent | cb8ccb2271727fc114ca43104d3333ee4635cc79 (diff) | |
Revert "manager: print ephemeral information about running jobs' timeouts"
This reverts commit 2cba2e03524ec0922ddc70f933e8a89b7d23b4ec.
It breaks bootup with dracut, the transition to the real rootfs fails.
Diffstat (limited to 'src/core/job.c')
| -rw-r--r-- | src/core/job.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/job.c b/src/core/job.c index 93fa44a506..1bcf4968e2 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -864,14 +864,11 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user int job_start_timer(Job *j) { int r; - if (j->timer_event_source) + if (j->unit->job_timeout <= 0 || j->timer_event_source) return 0; j->begin_usec = now(CLOCK_MONOTONIC); - if (j->unit->job_timeout <= 0) - return 0; - r = sd_event_add_monotonic(j->manager->event, j->begin_usec + j->unit->job_timeout, 0, job_dispatch_timer, j, &j->timer_event_source); if (r < 0) return r; |