X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fshutdown.c;h=4709746de40b616fde8b8fbcb17260b9b5d34c21;hp=b59aef174f14f1fd82e2069a0f406ebd43d46551;hb=13b84ec7df103ce388910a2b868fe1668c1e27ef;hpb=0049f05a8bb82c3e084bacc5945596761d706c55

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index b59aef174..4709746de 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -39,6 +39,7 @@
 
 #include "missing.h"
 #include "log.h"
+#include "fileio.h"
 #include "umount.h"
 #include "util.h"
 #include "mkdir.h"
@@ -130,12 +131,27 @@ static int pivot_to_new_root(void) {
 }
 
 int main(int argc, char *argv[]) {
+        _cleanup_free_ char *line = NULL;
         int cmd, r;
         unsigned retries;
         bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true;
         bool in_container, use_watchdog = false;
         char *arguments[3];
 
+        /* suppress shutdown status output if 'quiet' is used  */
+        r = read_one_line_file("/proc/cmdline", &line);
+        if (r >= 0) {
+                char *w, *state;
+                size_t l;
+
+                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();
         log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */
         log_open();
@@ -197,31 +213,34 @@ int main(int argc, char *argv[]) {
                 if (need_umount) {
                         log_info("Unmounting file systems.");
                         r = umount_all(&changed);
-                        if (r == 0)
+                        if (r == 0) {
                                 need_umount = false;
-                        else if (r > 0)
+                                log_info("All filesystems unmounted.");
+                        } else if (r > 0)
                                 log_info("Not all file systems unmounted, %d left.", r);
                         else
                                 log_error("Failed to unmount file systems: %s", strerror(-r));
                 }
 
                 if (need_swapoff) {
-                        log_info("Disabling swaps.");
+                        log_info("Deactivating swaps.");
                         r = swapoff_all(&changed);
-                        if (r == 0)
+                        if (r == 0) {
                                 need_swapoff = false;
-                        else if (r > 0)
-                                log_info("Not all swaps are turned off, %d left.", r);
+                                log_info("All swaps deactivated.");
+                        } else if (r > 0)
+                                log_info("Not all swaps deactivated, %d left.", r);
                         else
-                                log_error("Failed to turn off swaps: %s", strerror(-r));
+                                log_error("Failed to deactivate swaps: %s", strerror(-r));
                 }
 
                 if (need_loop_detach) {
                         log_info("Detaching loop devices.");
                         r = loopback_detach_all(&changed);
-                        if (r == 0)
+                        if (r == 0) {
                                 need_loop_detach = false;
-                        else if (r > 0)
+                                log_info("All loop devices detached.");
+                        } else if (r > 0)
                                 log_info("Not all loop devices detached, %d left.", r);
                         else
                                 log_error("Failed to detach loop devices: %s", strerror(-r));
@@ -230,10 +249,11 @@ int main(int argc, char *argv[]) {
                 if (need_dm_detach) {
                         log_info("Detaching DM devices.");
                         r = dm_detach_all(&changed);
-                        if (r == 0)
+                        if (r == 0) {
                                 need_dm_detach = false;
-                        else if (r > 0)
-                                log_warning("Not all DM devices detached, %d left.", r);
+                                log_info("All DM devices detached.");
+                        } else if (r > 0)
+                                log_info("Not all DM devices detached, %d left.", r);
                         else
                                 log_error("Failed to detach DM devices: %s", strerror(-r));
                 }
@@ -257,17 +277,22 @@ int main(int argc, char *argv[]) {
 
         if (retries >= FINALIZE_ATTEMPTS)
                 log_error("Too many iterations, giving up.");
+        else
+                log_info("Storage is finalized.");
 
         arguments[0] = NULL;
         arguments[1] = argv[1];
         arguments[2] = NULL;
         execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, arguments);
 
-        if (!in_container &&
+        if (!in_container && !in_initrd() &&
             access("/run/initramfs/shutdown", X_OK) == 0) {
 
                 if (prepare_new_root() >= 0 &&
                     pivot_to_new_root() >= 0) {
+
+                        log_info("Returning to initrd...");
+
                         execv("/shutdown", argv);
                         log_error("Failed to execute shutdown binary: %m");
                 }
@@ -293,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;
                         }