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 75C441396D1 for ; Mon, 18 Sep 2017 18:07:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0E311FC0AF; Mon, 18 Sep 2017 18:07:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BF15F1FC0AF for ; Mon, 18 Sep 2017 18:07: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 055D933BE25 for ; Mon, 18 Sep 2017 18:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E3939080 for ; Mon, 18 Sep 2017 18:07:38 +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: <1505599372.3fafd7a76e6adf15ec72a7ba5f44583eff8fab7a.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/sysfs.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 3fafd7a76e6adf15ec72a7ba5f44583eff8fab7a X-VCS-Branch: master Date: Mon, 18 Sep 2017 18:07:38 +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: 38ccc257-bd3d-411c-a0d7-9935e7c0bf9a X-Archives-Hash: fe150c6ccfde5c2ba95adce9527c9353 commit: 3fafd7a76e6adf15ec72a7ba5f44583eff8fab7a Author: William Hubbs gmail com> AuthorDate: Sat Sep 16 22:02:52 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Sep 16 22:02:52 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3fafd7a7 sysfs: fix cgroup hybrid mode In hybrid mode, we should not try to mount cgroup2 if it is not available in the kernel. This fixes #164. init.d/sysfs.in | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 9f39fb57..23e8821c 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -150,6 +150,16 @@ cgroup1_controllers() return 0 } +cgroup2_base() +{ + local base + base="$(cgroup2_find_path)" + mkdir -p "${base}" + mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" "${base}" 2> /dev/null || + mount -t cgroup2 none -o "${sysfs_opts}" "${base}" + return 0 +} + cgroup2_controllers() { local active cgroup_path x y @@ -169,13 +179,12 @@ cgroup2_controllers() cgroups_hybrid() { - grep -qw cgroup /proc/filesystems && - grep -qw cgroup2 /proc/filesystems || - return 0 + grep -qw cgroup /proc/filesystems || return 0 cgroup1_base - mkdir /sys/fs/cgroup/unified - mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup/unified - cgroup2_controllers + if grep -qw cgroup2 /proc/filesystems; then + cgroup2_base + cgroup2_controllers + fi cgroup1_controllers return 0 } @@ -190,8 +199,8 @@ cgroups_legacy() cgroups_unified() { - grep -qw cgroup2 /proc/filesystems || return 0 - mount -t cgroup2 none -o "${sysfs_opts},nsdelegate" /sys/fs/cgroup + cgroup2_base + cgroup2_controllers return 0 }