From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 29 Sep 2015 20:40:05 +0000 (+0200)
Subject: systemctl: when reading legacy -t argument for shutdown, don't drop following parameter
X-Git-Tag: v227~55^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4420f7b8ed73b05ef6f31622101e7804daef69f;p=thirdparty%2Fsystemd.git

systemctl: when reading legacy -t argument for shutdown, don't drop following parameter

We currently completely ignore the following parameter, but we really
should not, as that is actually the time to shut down on.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 621c931c0ba..a965369c0c8 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7003,7 +7003,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "HPrhkKt:afFc", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "HPrhkKtafFc", options, NULL)) >= 0)
                 switch (c) {
 
                 case ARG_HELP:
@@ -7486,6 +7486,10 @@ static int logind_schedule_shutdown(void) {
         case ACTION_KEXEC:
                 action = "kexec";
                 break;
+        case ACTION_EXIT:
+                action = "exit";
+                break;
+        case ACTION_REBOOT:
         default:
                 action = "reboot";
                 break;