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 36D7A1382C5 for ; Tue, 22 May 2018 22:12:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B07EE086C; Tue, 22 May 2018 22:12:47 +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 042CAE086C for ; Tue, 22 May 2018 22:12:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 423D0335C77 for ; Tue, 22 May 2018 22:12:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DBA22AE for ; Tue, 22 May 2018 22:12:43 +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: <1527009638.fa5aea80c50fb724d2c98a6542307adbafd0e62d.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/openrc-run.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: fa5aea80c50fb724d2c98a6542307adbafd0e62d X-VCS-Branch: master Date: Tue, 22 May 2018 22:12:43 +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: b98a91a0-729f-4184-a1d4-5e9406ed6a6b X-Archives-Hash: 6b2c71bbedd71659720bef90726ce897 commit: fa5aea80c50fb724d2c98a6542307adbafd0e62d Author: William Hubbs gmail com> AuthorDate: Tue May 22 16:12:12 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue May 22 17:20:38 2018 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fa5aea80 openrc-run.sh: move crashed test outside started test This is handled inside librc, so we don't need the nesting in this script. sh/openrc-run.sh.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in index e3dff6ce..7e9064c2 100644 --- a/sh/openrc-run.sh.in +++ b/sh/openrc-run.sh.in @@ -133,11 +133,10 @@ _status() elif service_inactive; then ewarn "status: inactive" return 16 + elif service_crashed; then + eerror "status: crashed" + return 32 elif service_started; then - if service_crashed; then - eerror "status: crashed" - return 32 - fi einfo "status: started" return 0 else