X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fshutdown.c;h=923cd3b16c9f72e1f6ae9b8b8042e3c33aec9405;hb=b2dc4e44c540a30c5ea12a9a570425ceb310c320;hp=dd11ae3d6fa9f749431df1238fb04386a93d615f;hpb=3f85ef0f05ffc51e19f86fb83a1c51e8e3cd6817;p=elogind.git

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index dd11ae3d6..923cd3b16 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -75,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0)
+        /* "-" prevents getopt from permuting argv[] and moving the verb away
+         * from argv[1]. Our interface to initrd promises it'll be there. */
+        while ((c = getopt_long(argc, argv, "-", options, NULL)) >= 0)
                 switch (c) {
 
                 case ARG_LOG_LEVEL:
@@ -113,6 +115,13 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
 
+                case '\001':
+                        if (!arg_verb)
+                                arg_verb = optarg;
+                        else
+                                log_error("Excess arguments, ignoring");
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -120,15 +129,11 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached("Unhandled option code.");
                 }
 
-        if (optind >= argc) {
+        if (!arg_verb) {
                 log_error("Verb argument missing.");
                 return -EINVAL;
         }
 
-        arg_verb = argv[optind];
-
-        if (optind + 1 < argc)
-                log_error("Excess arguments, ignoring");
         return 0;
 }
 
@@ -235,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) {
@@ -247,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) {
@@ -259,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) {
@@ -271,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) {
@@ -324,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");
 
         }
 
@@ -411,7 +416,7 @@ int main(int argc, char *argv[]) {
         r = -errno;
 
   error:
-        log_error("Critical error while doing system shutdown: %s", strerror(-r));
+        log_emergency_errno(r, "Critical error while doing system shutdown: %m");
 
         freeze();
 }