summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-07 15:53:21 +0300
committerLennart Poettering <lennart@poettering.net>2015-10-07 15:53:21 +0300
commit7c85ab42dda080cfed2386880b9c07ac03fa9d56 (patch)
tree9141cb198cb56b7e6d8af93968955f1e6a408983 /man
parent42911a567dc22c3115fb3ee3c56a7dcfb034f102 (diff)
parent7d06dad900b0f1541531255fb6409d92fc76483d (diff)
Merge pull request #1486 from michich/crash-handler
core: crash handler changes, CrashChangeVT parsing fix
Diffstat (limited to 'man')
-rw-r--r--man/systemd.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/man/systemd.xml b/man/systemd.xml
index 391333bfb4..8d74ca49c3 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -922,9 +922,8 @@
the machine automatically when it crashes, after a 10s delay.
Otherwise, the system will hang indefinitely. Defaults to
<option>no</option>, in order to avoid a reboot loop. If
- combined with <varname>systemd.crash_shell=</varname>, it is
- first attempted to invoke a shell, and if this is not
- successful the system is rebooted.</para></listitem>
+ combined with <varname>systemd.crash_shell=</varname>, the
+ system is rebooted after the shell exits.</para></listitem>
</varlistentry>
<varlistentry>