chiark / gitweb /
build-sys: discover the path to kexec during build time
[elogind.git] / src / core / shutdown.c
index c02a14d66e2f18bcb43171f15b4ca57bc70a969b..4709746de40b616fde8b8fbcb17260b9b5d34c21 100644 (file)
@@ -144,11 +144,12 @@ int main(int argc, char *argv[]) {
                 char *w, *state;
                 size_t l;
 
-                FOREACH_WORD_QUOTED(w, l, line, state)
-                        if (streq(w, "quiet")) {
+                FOREACH_WORD_QUOTED(w, l, line, state) {
+                        if (l == 5 && memcmp(w, "quiet", 5) == 0) {
                                 log_set_max_level(LOG_WARNING);
                                 break;
                         }
+                }
         }
 
         log_parse_environment();
@@ -317,7 +318,7 @@ int main(int argc, char *argv[]) {
                                 log_warning("kexec failed. Falling back to normal reboot.");
                         } else {
                                 /* Child */
-                                const char *args[3] = { "/sbin/kexec", "-e", NULL };
+                                const char *args[3] = { KEXEC, "-e", NULL };
                                 execv(args[0], (char * const *) args);
                                 return EXIT_FAILURE;
                         }