From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D409138334 for ; Fri, 2 Nov 2018 23:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1112CE0934; Fri, 2 Nov 2018 23:24:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFF3CE0934 for ; Fri, 2 Nov 2018 23:24:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39CBB335C6F for ; Fri, 2 Nov 2018 23:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EB8E44C for ; Fri, 2 Nov 2018 23:24:36 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1540412680.e2416d089396e2b9a72cc56ef9f57886ffb0f1c8.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/openrc-shutdown.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e2416d089396e2b9a72cc56ef9f57886ffb0f1c8 X-VCS-Branch: master Date: Fri, 2 Nov 2018 23:24:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 559bcc98-734f-4480-9f13-05c9e086d8d8 X-Archives-Hash: ba1d3775e2e158625f5e2abb49897af4 commit: e2416d089396e2b9a72cc56ef9f57886ffb0f1c8 Author: William Hubbs gmail com> AuthorDate: Wed Oct 24 20:24:29 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Oct 24 20:24:40 2018 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e2416d08 openrc-shutdown: do not require a time for -w switch X-Gentoo-Bug: 669500 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=669500 src/rc/openrc-shutdown.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rc/openrc-shutdown.c b/src/rc/openrc-shutdown.c index ab2e7469..71a91255 100644 --- a/src/rc/openrc-shutdown.c +++ b/src/rc/openrc-shutdown.c @@ -250,6 +250,9 @@ int main(int argc, char **argv) } else if (do_reexec) { send_cmd("reexec"); exit(EXIT_SUCCESS); + } else if (do_wtmp_only) { + log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~"); + exit(EXIT_SUCCESS); } if (optind >= argc) { @@ -329,7 +332,5 @@ int main(int argc, char **argv) send_cmd("reboot"); else if (do_single) send_cmd("single"); - else if (do_wtmp_only) - log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~"); return 0; }