diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-04-16 21:41:18 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-04-28 08:52:17 -0400 |
| commit | b53374f99b619abd90a7c19d69d37a3298b084d5 (patch) | |
| tree | d88887a7612fdc1de6030b2df2e2bf67b990d3a7 | |
| parent | ea35a386133b7998e9419a666c36bf38433c4b5c (diff) | |
| download | systemd-b53374f99b619abd90a7c19d69d37a3298b084d5.tar.gz | |
units: specify timeouts for more oneshot services
Even trivial service occasionally get stuck, for example when
there's a problem with the journal. There's nothing more annoying
that looking at the cylon eye for a job with an infinite timeout.
Use standard 90s for jobs that do some work, and 30s for those which
should be almost instantenous.
| -rw-r--r-- | units/systemd-binfmt.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-hwdb-update.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-machine-id-commit.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-modules-load.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-random-seed.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-rfkill@.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-sysctl.service.in | 1 | ||||
| -rw-r--r-- | units/systemd-sysusers.service.in | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index 34a5d5237b..d53073ee61 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -24,3 +24,4 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt +TimeoutSec=90s diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in index 791528e2b2..7135cff3d9 100644 --- a/units/systemd-hwdb-update.service.in +++ b/units/systemd-hwdb-update.service.in @@ -21,3 +21,4 @@ ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/ Type=oneshot RemainAfterExit=yes ExecStart=@rootbindir@/systemd-hwdb update +TimeoutSec=90s diff --git a/units/systemd-machine-id-commit.service.in b/units/systemd-machine-id-commit.service.in index dd765b6608..cccbf7b626 100644 --- a/units/systemd-machine-id-commit.service.in +++ b/units/systemd-machine-id-commit.service.in @@ -19,3 +19,4 @@ ConditionPathIsMountPoint=/etc/machine-id Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-machine-id-commit +TimeoutSec=30s diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in index 040a0febe8..9de6d31349 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -24,3 +24,4 @@ ConditionKernelCommandLine=|rd.modules-load Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-modules-load +TimeoutSec=90s diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in index b55844b36f..115233268d 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -19,3 +19,4 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-random-seed load ExecStop=@rootlibexecdir@/systemd-random-seed save +TimeoutSec=30s diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in index b48efe5d99..e53bf5fbba 100644 --- a/units/systemd-rfkill@.service.in +++ b/units/systemd-rfkill@.service.in @@ -20,3 +20,4 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-rfkill load %I ExecStop=@rootlibexecdir@/systemd-rfkill save %I +TimeoutSec=30s diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in index fa72085f9e..d784c6426d 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -18,3 +18,4 @@ ConditionPathIsReadWrite=/proc/sys/ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-sysctl +TimeoutSec=90s diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in index ffd6d7747b..4d8309ab6b 100644 --- a/units/systemd-sysusers.service.in +++ b/units/systemd-sysusers.service.in @@ -18,3 +18,4 @@ ConditionNeedsUpdate=/etc Type=oneshot RemainAfterExit=yes ExecStart=@rootbindir@/systemd-sysusers +TimeoutSec=90s |