initctl: check for kexec_loaded when reboot is requested through initctl

diff --git a/src/initctl.c b/src/initctl.c
index f36f1cc704fd49417004dd5593fcf5271c13149a..eaa717ad916bdb55115870696123397bb012759e 100644 (file)
--- 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 604400d8fb7b9d0aa14c79297a30faa4b29e6cfd..0a35d8e021a59d3ab009049b2c4998fb40132c9f 100644 (file)
--- 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 65d4b143dc97cbdae365fe6199ac5eb32be4b576..6033aa05b271b4f55f361d31d576ba13c979de76 100644 (file)
--- 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 a6b700c82e13547903b9bb620961005cd491ffaf..3e1f46d82697d7aea47eb377924074bf0d03a1f3 100644 (file)
--- 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