summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/main.c b/main.c
index 5f0aeba857..68a9021083 100644
--- a/main.c
+++ b/main.c
@@ -48,7 +48,8 @@ static char *default_unit = NULL;
static ManagerRunningAs running_as = _MANAGER_RUNNING_AS_INVALID;
static bool dump_core = true;
-static bool crash_shell = true;
+static bool crash_shell = false;
+static int crash_chvt = -1;
_noreturn static void freeze(void) {
for (;;)
@@ -102,6 +103,9 @@ _noreturn static void crash(int sig) {
}
}
+ if (crash_chvt)
+ chvt(crash_chvt);
+
if (crash_shell) {
log_info("Executing crash shell in 10s...");
sleep(10);
@@ -170,7 +174,7 @@ static int parse_proc_cmdline_word(const char *word) {
int r;
if ((r = parse_boolean(word + 18)) < 0)
- log_warning("Failed to parse dump core switch %s, Ignoring", word + 18);
+ log_warning("Failed to parse dump core switch %s, Ignoring.", word + 18);
else
dump_core = r;
@@ -178,10 +182,18 @@ static int parse_proc_cmdline_word(const char *word) {
int r;
if ((r = parse_boolean(word + 20)) < 0)
- log_warning("Failed to parse crash shell switch %s, Ignoring", word + 20);
+ log_warning("Failed to parse crash shell switch %s, Ignoring.", word + 20);
else
crash_shell = r;
+ } else if (startswith(word, "systemd.crash_chvt=")) {
+ int k;
+
+ if (safe_atoi(word + 19, &k) < 0)
+ log_warning("Failed to parse crash chvt switch %s, Ignoring.", word + 19);
+ else
+ crash_chvt = k;
+
} else if (startswith(word, "systemd.")) {
log_warning("Unknown kernel switch %s. Ignoring.", word);
@@ -192,6 +204,7 @@ static int parse_proc_cmdline_word(const char *word) {
log_info("systemd.log_level=LEVEL Log level");
log_info("systemd.dump_core=0|1 Dump core on crash");
log_info("systemd.crash_shell=0|1 On crash run shell");
+ log_info("systemd.crash_chvt=N Change to VT #N on crash");
} else {
unsigned i;