diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-16 17:12:35 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-16 17:12:40 +0200 |
| commit | 6b5ad000aba61a5312b5c3fac7dd85a0d33816af (patch) | |
| tree | 312d5d377c0968b8724b06bbb95a2a38f9173521 | |
| parent | 5dc50792ac1bc627bf9b50d259b4e7546b3f8d86 (diff) | |
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
| -rw-r--r-- | man/shutdown.xml | 2 | ||||
| -rw-r--r-- | src/shutdownd.c | 2 | ||||
| -rw-r--r-- | src/systemctl.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/man/shutdown.xml b/man/shutdown.xml index 95884921ac..c48e141879 100644 --- a/man/shutdown.xml +++ b/man/shutdown.xml @@ -72,7 +72,7 @@ number of minutes m from now. <literal>now</literal> is an alias for <literal>+0</literal>, i.e. for triggering an immediate shutdown. If no time argument - is specified, <literal>now</literal> is + is specified, <literal>+1</literal> is implied.</para> <para>Note that to specify a wall message you must diff --git a/src/shutdownd.c b/src/shutdownd.c index 241c4327a6..751a1a59b8 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 e517031cea..2b34798d06 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) |