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 89E5D1396D0 for ; Fri, 15 Sep 2017 18:44:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C80211FC051; Fri, 15 Sep 2017 18:44:57 +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 A2D6F1FC051 for ; Fri, 15 Sep 2017 18:44:57 +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 B157233BE18 for ; Fri, 15 Sep 2017 18:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 509EF9065 for ; Fri, 15 Sep 2017 18:44:55 +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: <1505500970.4651b8c7e9e2ef9c1ea1fb8d174d1ca4693627af.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/rc-cgroup.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 4651b8c7e9e2ef9c1ea1fb8d174d1ca4693627af X-VCS-Branch: master Date: Fri, 15 Sep 2017 18:44:55 +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: f78e968b-1e4c-41a0-a3c8-f3918b5d3e60 X-Archives-Hash: 897d7195124a9687946db970fc132c44 commit: 4651b8c7e9e2ef9c1ea1fb8d174d1ca4693627af Author: William Hubbs gmail com> AuthorDate: Fri Sep 15 18:42:50 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Sep 15 18:42:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4651b8c7 rc-cgroup.sh: cgroup_cleanup fix error handling cgroup_cleanup should warn if it is unable to clean up all processes in the control group, but it will always return success. sh/rc-cgroup.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in index 3c7558cd..2a54ee4a 100644 --- a/sh/rc-cgroup.sh.in +++ b/sh/rc-cgroup.sh.in @@ -212,5 +212,7 @@ cgroup_cleanup() yesno "${rc_send_sigkill:-yes}" && kill -s KILL ${pids} 2> /dev/null fi - eend 0 + [ -z "$(cgroup_get_pids)" ] + eend $? "Unable to stop all processes" + return 0 }