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 2C2F81396D0 for ; Fri, 15 Sep 2017 20:32:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E498E090A; Fri, 15 Sep 2017 20:32:25 +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 2B7C0E090A for ; Fri, 15 Sep 2017 20:32:25 +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 2401733BE2E for ; Fri, 15 Sep 2017 20:32:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDF498F73 for ; Fri, 15 Sep 2017 20:32:21 +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: <1505503354.25b45a5a239318fb57c405c3fe64e53b0738ad68.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: 25b45a5a239318fb57c405c3fe64e53b0738ad68 X-VCS-Branch: master Date: Fri, 15 Sep 2017 20:32:21 +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: 45d2a1c7-36d3-4c83-a127-2bea82295a99 X-Archives-Hash: 139b09486771edee402f1df9eadbe7de commit: 25b45a5a239318fb57c405c3fe64e53b0738ad68 Author: William Hubbs gmail com> AuthorDate: Fri Sep 15 19:22:34 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Sep 15 19:22:34 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=25b45a5a cgroup_cleanup: try to remove the cgroup version 2 cgroup If we were able to kill all the processes in the cgroup, it should be removed. sh/rc-cgroup.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in index 2a54ee4a..930eeefc 100644 --- a/sh/rc-cgroup.sh.in +++ b/sh/rc-cgroup.sh.in @@ -212,6 +212,7 @@ cgroup_cleanup() yesno "${rc_send_sigkill:-yes}" && kill -s KILL ${pids} 2> /dev/null fi + cgroup2_remove [ -z "$(cgroup_get_pids)" ] eend $? "Unable to stop all processes" return 0