diff options
| -rw-r--r-- | src/initctl.c | 2 | ||||
| -rw-r--r-- | src/systemctl.c | 12 | ||||
| -rw-r--r-- | src/util.c | 12 | ||||
| -rw-r--r-- | src/util.h | 2 |
4 files changed, 16 insertions, 12 deletions
diff --git a/src/initctl.c b/src/initctl.c index f36f1cc704..eaa717ad91 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -93,6 +93,8 @@ static const char *translate_runlevel(int runlevel, bool *isolate) { for (i = 0; i < ELEMENTSOF(table); i++) if (table[i].runlevel == runlevel) { *isolate = table[i].isolate; + if (runlevel == '6' && kexec_loaded()) + return SPECIAL_KEXEC_TARGET; return table[i].special; } diff --git a/src/systemctl.c b/src/systemctl.c index 604400d8fb..0a35d8e021 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -4427,18 +4427,6 @@ static int parse_time_spec(const char *t, usec_t *_u) { return 0; } -static bool kexec_loaded(void) { - bool loaded = false; - char *s; - - if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) { - if (s[0] == '1') - loaded = true; - free(s); - } - return loaded; -} - static int shutdown_parse_argv(int argc, char *argv[]) { enum { diff --git a/src/util.c b/src/util.c index 65d4b143dc..6033aa05b2 100644 --- a/src/util.c +++ b/src/util.c @@ -5852,3 +5852,15 @@ static const char *const signal_table[] = { }; DEFINE_STRING_TABLE_LOOKUP(signal, int); + +bool kexec_loaded(void) { + bool loaded = false; + char *s; + + if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) { + if (s[0] == '1') + loaded = true; + free(s); + } + return loaded; +} diff --git a/src/util.h b/src/util.h index a6b700c82e..3e1f46d826 100644 --- a/src/util.h +++ b/src/util.h @@ -504,4 +504,6 @@ int signal_from_string_try_harder(const char *s); extern int saved_argc; extern char **saved_argv; +bool kexec_loaded(void); + #endif |