diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-30 23:54:21 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-02-01 12:44:03 -0500 |
| commit | 0775b9b61120f8be99cd45a7df907b828188cb47 (patch) | |
| tree | e00e49d60119061b84ebff95a86f215e4ec75f9a /units | |
| parent | core/cgroup: fix embarrassing typo (diff) | |
| download | systemd-0775b9b61120f8be99cd45a7df907b828188cb47.tar.gz systemd-0775b9b61120f8be99cd45a7df907b828188cb47.tar.bz2 systemd-0775b9b61120f8be99cd45a7df907b828188cb47.zip | |
units: set TimeoutSec on some oneshot services
Services which are not crucial to system bootup, and have Type=oneshot
can effectively "hang" the system if they fail to complete for whatever
reason. To allow the boot to continue, kill them after a timeout.
In case of systemd-journal-flush the flush will continue in the background,
and in the other two cases the job will be aborted, but this should not
result in any permanent problem.
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-backlight@.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-journal-catalog-update.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-journal-flush.service.in | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in index ecf3de48d..19d640bfb 100644 --- a/units/systemd-backlight@.service.in +++ b/units/systemd-backlight@.service.in @@ -19,3 +19,4 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-backlight load %i ExecStop=@rootlibexecdir@/systemd-backlight save %i +TimeoutSec=2min diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in index bfa5e6b43..966731092 100644 --- a/units/systemd-journal-catalog-update.service.in +++ b/units/systemd-journal-catalog-update.service.in @@ -18,3 +18,4 @@ ConditionNeedsUpdate=/etc Type=oneshot RemainAfterExit=yes ExecStart=@rootbindir@/journalctl --update-catalog +TimeoutSec=2min diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in index 98c91b4bc..53a6f30cf 100644 --- a/units/systemd-journal-flush.service.in +++ b/units/systemd-journal-flush.service.in @@ -19,3 +19,4 @@ RequiresMountsFor=/var/log/journal ExecStart=@rootbindir@/journalctl --flush Type=oneshot RemainAfterExit=yes +TimeoutSec=2min |