X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fshutdown.c;fp=src%2Fcore%2Fshutdown.c;h=53c701a8f0a016e338cd4af1889b3bb67e435782;hp=121998ff5c403ff675ca429ea43ebe13910bd378;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=b4d23205f238e06aaa31264628e20669e714acad

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 121998ff5..53c701a8f 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -240,7 +240,7 @@ int main(int argc, char *argv[]) {
                         } 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));
+                                log_error_errno(-r, "Failed to unmount file systems: %m");
                 }
 
                 if (need_swapoff) {
@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) {
                         } else if (r > 0)
                                 log_info("Not all swaps deactivated, %d left.", r);
                         else
-                                log_error("Failed to deactivate swaps: %s", strerror(-r));
+                                log_error_errno(-r, "Failed to deactivate swaps: %m");
                 }
 
                 if (need_loop_detach) {
@@ -264,7 +264,7 @@ int main(int argc, char *argv[]) {
                         } 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));
+                                log_error_errno(-r, "Failed to detach loop devices: %m");
                 }
 
                 if (need_dm_detach) {
@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
                         } 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));
+                                log_error_errno(-r, "Failed to detach DM devices: %m");
                 }
 
                 if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) {
@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) {
                         execv("/shutdown", argv);
                         log_error("Failed to execute shutdown binary: %m");
                 } else
-                        log_error("Failed to switch root to \"/run/initramfs\": %s", strerror(-r));
+                        log_error_errno(-r, "Failed to switch root to \"/run/initramfs\": %m");
 
         }
 
@@ -416,7 +416,7 @@ int main(int argc, char *argv[]) {
         r = -errno;
 
   error:
-        log_emergency("Critical error while doing system shutdown: %s", strerror(-r));
+        log_emergency_errno(-r, "Critical error while doing system shutdown: %m");
 
         freeze();
 }