[systemd-commits] 2 commits - man/systemd.xml src/core

[Lennart Poettering]

 man/systemd.xml    |   15 ++++++++++++---
 src/core/manager.c |    1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 5eeac515bf234a111f0e37355893dfb96926f676
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 28 02:33:22 2015 +0100

    man: document the new Ctrl-Alt-Del magic

diff --git a/man/systemd.xml b/man/systemd.xml
index e0e8d37..d020582 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -627,10 +627,19 @@
                                 <listitem><para>Upon receiving this
                                 signal the systemd system manager will
                                 start the
-                                <filename>ctrl-alt-del.target</filename> unit. This
-                                is mostly equivalent to
+                                <filename>ctrl-alt-del.target</filename>
+                                unit. This is mostly equivalent to
                                 <command>systemctl start
-                                ctl-alt-del.target</command>.</para>
+                                ctl-alt-del.target</command>. 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.</para>
 
                                 <para>systemd user managers
                                 treat this signal the same way as

commit a626df3efd908b6d868d49207905bdd5162e5609
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 28 02:26:03 2015 +0100

    manager: when we immediately reboot due to 7x C-A-D within 2s, mention this on the console too

diff --git a/src/core/manager.c b/src/core/manager.c
index 336ec1e..d86fdd2 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1733,6 +1733,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                                         manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
                                 else {
                                         log_notice("Ctrl-Alt-Del was pressed more than 7 times within 2s, rebooting immediately.");
+                                        status_printf(NULL, true, false, "Ctrl-Alt-Del was pressed more than 7 times within 2s, rebooting immediately.");
                                         m->exit_code = MANAGER_REBOOT;
                                 }