From 98709151f3e782eb508ba15e2a12c0b46003f061 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 14 Jun 2012 17:07:07 +0200
Subject: service: timeout for oneshot services

Add possibility to specify timeout for oneshot services.

[ https://bugzilla.redhat.com/show_bug.cgi?id=761656
  Added minor fixups. -- michich ]
---
 man/systemd.service.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'man/systemd.service.xml')

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 12d0b8a12b..233807d2b3 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -470,7 +470,9 @@
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                90s.</para></listitem>
+                                90s, except when <varname>Type=oneshot</varname> is
+                                used in which case the timeout
+                                is disabled by default.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-- 
cgit v1.2.3-54-g00ecf