X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=d020582b539cb1ea38f2d4a2e493b208fa3d142b;hb=b7ce6b592d8908d378904323a4a6670bfe0b7ab1;hp=bf7a7a6f67209c7dc4384d1e3c9af46ef1b191b4;hpb=f280bcfb21aacce03abf17b3ad732c1351df42b9;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index bf7a7a6f6..d020582b5 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -75,10 +75,12 @@
telinit8
for more information.
- When run as system instance, systemd interprets
- the configuration file
- system.conf, otherwise
- user.conf. See
+ When run as a system instance, systemd interprets the
+ configuration file system.conf and the
+ files in system.conf.d directories; when
+ run as a user instance, systemd interprets the configuration
+ file user.conf and the files in
+ user.conf.d directories. See
systemd-system.conf5
for more information.
@@ -625,10 +627,19 @@
Upon receiving this
signal the systemd system manager will
start the
- ctrl-alt-del.target unit. This
- is mostly equivalent to
+ ctrl-alt-del.target
+ unit. This is mostly equivalent to
systemctl start
- ctl-alt-del.target.
+ ctl-alt-del.target. If this
+ signal is received more often than 7
+ times per 2s an immediate reboot is
+ triggered. Note that pressing
+ Ctrl-Alt-Del on the console will
+ trigger this signal. Hence, if a
+ reboot is hanging pressing
+ Ctrl-Alt-Del more than 7 times in 2s
+ is a relatively safe way to trigger an
+ immediate reboot.
systemd user managers
treat this signal the same way as
@@ -679,7 +690,7 @@
received the systemd manager will log
its complete state in human readable
form. The data logged is the same as
- printed by systemctl
+ printed by systemd-analyze
dump.