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 5DFFF1382C5 for ; Sun, 6 Dec 2020 18:44:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB332E09C7; Sun, 6 Dec 2020 18:44:20 +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 92DE1E09C7 for ; Sun, 6 Dec 2020 18:44:20 +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 4BD68340DA0 for ; Sun, 6 Dec 2020 18:44:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16E1647F for ; Sun, 6 Dec 2020 18:44:16 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1607276299.ff3c16a753bb56cf05c8ddd03354dbc8a36d0aa7.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/pcs/files/openrc-0.10.7.patch X-VCS-Directories: sys-cluster/pcs/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: ff3c16a753bb56cf05c8ddd03354dbc8a36d0aa7 X-VCS-Branch: master Date: Sun, 6 Dec 2020 18:44:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 79e93064-0efb-46b7-91bc-a7826fba2240 X-Archives-Hash: be37a30a54e5aaefe0118d238d0628a5 commit: ff3c16a753bb56cf05c8ddd03354dbc8a36d0aa7 Author: Andrea Postiglione gmail com> AuthorDate: Sun Dec 6 17:38:19 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sun Dec 6 17:38:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff3c16a7 sys-cluster/pcs: modify patch openrc Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Andrea Postiglione gmail.com> sys-cluster/pcs/files/openrc-0.10.7.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch index a2cd30d0..aad70cb1 100644 --- a/sys-cluster/pcs/files/openrc-0.10.7.patch +++ b/sys-cluster/pcs/files/openrc-0.10.7.patch @@ -18,7 +18,7 @@ cmd = ['systemctl', 'is-enabled', "#{service}.service"] else - cmd = ['chkconfig', service] -+ cmd = ['/usr/bin/rc-config','list default|/bin/grep -ow', service] ++ cmd = ['/usr/bin/rc-config','list default|/bin/grep -q', service] end _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) return (retcode == 0) @@ -27,7 +27,7 @@ cmd = ['systemctl', 'status', "#{service}.service"] else - cmd = ['service', service, 'status'] -+ cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -ow', service] ++ cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -q', service] end _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) return (retcode == 0)