From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Feb 2015 20:34:32 +0000 (+0100)
Subject: units: so far we defaulted to 90s as default timeout for most things, let's do so... 
X-Git-Tag: v219~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75f709fbf284041d951717cfb3bf6304db0fa7c9;p=thirdparty%2Fsystemd.git

units: so far we defaulted to 90s as default timeout for most things, let's do so for our oneshot services too

Fewer surprises, and stuff...
---

diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
index 19d640bfb04..5e6706c11c4 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -19,4 +19,4 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-backlight load %i
 ExecStop=@rootlibexecdir@/systemd-backlight save %i
-TimeoutSec=2min
+TimeoutSec=90s
diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in
index 9667310920b..6370dd478f2 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/units/systemd-journal-catalog-update.service.in
@@ -18,4 +18,4 @@ ConditionNeedsUpdate=/etc
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootbindir@/journalctl --update-catalog
-TimeoutSec=2min
+TimeoutSec=90s
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
index 53a6f30cfd8..a0a2e3fdb41 100644
--- a/units/systemd-journal-flush.service.in
+++ b/units/systemd-journal-flush.service.in
@@ -19,4 +19,4 @@ RequiresMountsFor=/var/log/journal
 ExecStart=@rootbindir@/journalctl --flush
 Type=oneshot
 RemainAfterExit=yes
-TimeoutSec=2min
+TimeoutSec=90s