X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshutdown.c;h=43165fefa7a77894ea88aa24cd8a038d7ae623c3;hb=d37fb98bbcf85115a03664437ae02aa95f6af4bc;hp=023648c4cf9d5e5c32b1405b1b56a0140e953ce7;hpb=b1b2a107d15a370d40b200172837bdd82ff3c3b2;p=elogind.git

diff --git a/src/shutdown.c b/src/shutdown.c
index 023648c4c..43165fefa 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -36,15 +36,10 @@
 #include "umount.h"
 #include "util.h"
 
-#define TIMEOUT_USEC    (5 * USEC_PER_SEC)
+#define TIMEOUT_USEC (5 * USEC_PER_SEC)
 #define FINALIZE_ATTEMPTS 50
 #define FINALIZE_CRITICAL_ATTEMPTS 10
 
-_noreturn_ static void freeze(void) {
-        for (;;)
-                pause();
-}
-
 static bool ignore_proc(pid_t pid) {
         if (pid == 1)
                 return true;
@@ -203,7 +198,6 @@ finish:
         return r;
 }
 
-
 int main(int argc, char *argv[]) {
         int cmd, r, retries;
         bool need_umount = true, need_swapoff = true, need_loop_detach = true;
@@ -213,7 +207,7 @@ int main(int argc, char *argv[]) {
         log_open();
 
         if (getpid() != 1) {
-                log_error("Not executed by init (pid-1).");
+                log_error("Not executed by init (pid 1).");
                 r = -EPERM;
                 goto error;
         }
@@ -252,12 +246,7 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 log_warning("Cannot send SIGKILL to all process: %s", strerror(r));
 
-
-        /* preventing that we won't block umounts */
-        if (chdir("/") != 0)
-                log_warning("Cannot chdir(\"/\"): %m. Unmounts likely to fail.");
-
-        /* umount all mountpoints, swaps, and loopback devices */
+        /* Unmount all mountpoints, swaps, and loopback devices */
         retries = FINALIZE_ATTEMPTS;
         while (need_umount || need_swapoff || need_loop_detach) {
                 if (need_umount) {
@@ -297,18 +286,18 @@ int main(int argc, char *argv[]) {
                 if (need_umount || need_swapoff || need_loop_detach) {
                         retries--;
 
-                        if (retries <= FINALIZE_CRITICAL_ATTEMPTS) {
+                        if (retries == FINALIZE_CRITICAL_ATTEMPTS) {
                                 log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes.");
                                 rescue_send_signal(SIGTERM);
                                 rescue_send_signal(SIGKILL);
                         }
 
                         if (retries > 0)
-                                log_info("Action still required, %d tries left", retries);
+                                log_info("Action still required, %d tries left.", retries);
                         else {
-                                log_error("Tried enough but still action required need_umount=%d, need_swapoff=%d, need_loop_detach=%d", need_umount, need_swapoff, need_loop_detach);
-                                r = -EBUSY;
-                                goto error;
+                                log_error("Giving up. Actions left: Umount=%s, Swap off=%s, Loop detach=%s",
+                                          yes_no(need_umount), yes_no(need_swapoff), yes_no(need_loop_detach));
+                                break;
                         }
                 }
         }
@@ -341,5 +330,5 @@ int main(int argc, char *argv[]) {
                 r = -r;
         log_error("Critical error while doing system shutdown: %s", strerror(r));
         freeze();
-        return 0;
+        return EXIT_FAILURE;
 }