X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshutdown.c;h=5c082cf4a5c27da59e014d9c72c9ac63f518c9a5;hb=63a723f3a7caf4eb1bc46a3849f59f27337924b7;hp=35426d2115c86f9410b11f7fbb4e4a892bd9540a;hpb=ab58e29119798f9f15a537fcd31119342db177a2;p=elogind.git

diff --git a/src/shutdown.c b/src/shutdown.c
index 35426d211..5c082cf4a 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -334,7 +334,9 @@ int main(int argc, char *argv[]) {
         }
 
         if (retries >= FINALIZE_ATTEMPTS)
-                log_error("Too many interations, giving up.");
+                log_error("Too many iterations, giving up.");
+
+        execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, NULL);
 
         sync();
 
@@ -349,7 +351,7 @@ int main(int argc, char *argv[]) {
                         log_warning("kexec failed. Falling back to normal reboot.");
                 } else {
                         /* Child */
-                        const char *args[5] = { KEXEC_BINARY_PATH, "-e", "-f", "-x", NULL };
+                        const char *args[3] = { "/sbin/kexec", "-e", NULL };
                         execv(args[0], (char * const *) args);
                         return EXIT_FAILURE;
                 }
@@ -362,7 +364,6 @@ int main(int argc, char *argv[]) {
         r = -errno;
 
   error:
-        sync();
         log_error("Critical error while doing system shutdown: %s", strerror(-r));
 
         freeze();