Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/
Date: Fri, 02 Nov 2018 23:24:42
Message-Id: 1540412680.e2416d089396e2b9a72cc56ef9f57886ffb0f1c8.williamh@OpenRC
1 commit: e2416d089396e2b9a72cc56ef9f57886ffb0f1c8
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Wed Oct 24 20:24:29 2018 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 24 20:24:40 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e2416d08
7
8 openrc-shutdown: do not require a time for -w switch
9
10 X-Gentoo-Bug: 669500
11 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=669500
12
13 src/rc/openrc-shutdown.c | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16 diff --git a/src/rc/openrc-shutdown.c b/src/rc/openrc-shutdown.c
17 index ab2e7469..71a91255 100644
18 --- a/src/rc/openrc-shutdown.c
19 +++ b/src/rc/openrc-shutdown.c
20 @@ -250,6 +250,9 @@ int main(int argc, char **argv)
21 } else if (do_reexec) {
22 send_cmd("reexec");
23 exit(EXIT_SUCCESS);
24 + } else if (do_wtmp_only) {
25 + log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
26 + exit(EXIT_SUCCESS);
27 }
28
29 if (optind >= argc) {
30 @@ -329,7 +332,5 @@ int main(int argc, char **argv)
31 send_cmd("reboot");
32 else if (do_single)
33 send_cmd("single");
34 - else if (do_wtmp_only)
35 - log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
36 return 0;
37 }