From fa1b91632c5220e6589007af4cd573ca909f915a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Oct 2014 01:42:13 +0100
Subject: core: remove system start timeout logic again

The system start timeout as previously implemented would get confused by
long-running services that are included in the initial system startup
transaction for example by being cron-job-like long-running services
triggered immediately at boot. Such long-running jobs would be subject
to the default 15min timeout, esily triggering it.

Hence, remove this again. In a subsequent commit, introduce per-target
job timeouts instead, that allow us to control these timeouts more
finegrained.
---
 man/systemd-system.conf.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'man/systemd-system.conf.xml')

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 1fad1dba80..284516d931 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -279,32 +279,6 @@
                                 too.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><varname>StartTimeoutSec=</varname></term>
-                                <term><varname>StartTimeoutAction=</varname></term>
-                                <term><varname>StartTimeoutRebootArgument=</varname></term>
-
-                                <listitem><para>Configures an over-all
-                                system start-up timeout and controls
-                                what to do when the timeout is
-                                reached. <varname>StartTimeoutSec=</varname>
-                                specifies the timeout, and defaults to
-                                <literal>15min</literal>. <varname>StartTimeoutAction=</varname>
-                                configures the action to take when the
-                                system did not finish boot-up within
-                                the specified time. It takes the same
-                                values as the per-service
-                                <varname>StartLimitAction=</varname>
-                                setting, see
-                                <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                                for details. Defaults to
-                                <option>poweroff-force</option>. <varname>StartTimeoutRebootArgument=</varname>
-                                configures an optional reboot string
-                                to pass to the
-                                <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                                system call.</para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><varname>DefaultTimerAccuracySec=</varname></term>
 
-- 
cgit v1.2.3-54-g00ecf