From 6b5ad000aba61a5312b5c3fac7dd85a0d33816af Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 16 Aug 2010 17:12:35 +0200 Subject: [PATCH] shutdown: if now time argument is passed, imply +1 not +0 That should friendlier for folks who just run "shutdown" to figure out the command line arguments... https://bugzilla.redhat.com/show_bug.cgi?id=624149 --- man/shutdown.xml | 2 +- src/shutdownd.c | 2 +- src/systemctl.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/man/shutdown.xml b/man/shutdown.xml index 95884921..c48e1418 100644 --- a/man/shutdown.xml +++ b/man/shutdown.xml @@ -72,7 +72,7 @@ number of minutes m from now. now is an alias for +0, i.e. for triggering an immediate shutdown. If no time argument - is specified, now is + is specified, +1 is implied. Note that to specify a wall message you must diff --git a/src/shutdownd.c b/src/shutdownd.c index 241c4327..751a1a59 100644 --- a/src/shutdownd.c +++ b/src/shutdownd.c @@ -88,7 +88,7 @@ static int read_packet(int fd, struct shutdownd_command *_c) { } if (n != sizeof(c)) { - log_warning("Message has invaliud size. Ignoring"); + log_warning("Message has invalid size. Ignoring"); return 0; } diff --git a/src/systemctl.c b/src/systemctl.c index e517031c..2b34798d 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -4233,11 +4233,13 @@ static int shutdown_parse_argv(int argc, char *argv[]) { } } - if (argc > optind) + if (argc > optind) { if ((r = parse_time_spec(argv[optind], &arg_when)) < 0) { log_error("Failed to parse time specification: %s", argv[optind]); return r; } + } else + arg_when = USEC_PER_MINUTE; /* We skip the time argument */ if (argc > optind + 1) -- 2.39.5