From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40954) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSjhL-0003gb-J9 for guix-patches@gnu.org; Sun, 26 Apr 2020 12:00:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSjhL-0000ZU-2M for guix-patches@gnu.org; Sun, 26 Apr 2020 12:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSjhK-0000Z1-HO for guix-patches@gnu.org; Sun, 26 Apr 2020 12:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSjhK-0003Gn-Gh for guix-patches@gnu.org; Sun, 26 Apr 2020 12:00:02 -0400 Subject: [bug#40871] [PATCH] file-systems: mount the PID cgroup filesystem. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:40870) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSjgV-0003Vr-W3 for guix-patches@gnu.org; Sun, 26 Apr 2020 11:59:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSjgV-0000L1-0J for guix-patches@gnu.org; Sun, 26 Apr 2020 11:59:11 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:59486) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSjgU-0008IH-BI for guix-patches@gnu.org; Sun, 26 Apr 2020 11:59:10 -0400 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Sun, 26 Apr 2020 17:58:58 +0200 Message-Id: <20200426155858.15674-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40871@debbugs.gnu.org * gnu/system/file-systems.scm (%control-groups): Add "pids". * gnu/services/docker.scm (docker-shepherd-service): Resolve a TODO. This has allowed me to make a specific configuration of nsjail work. --- gnu/services/docker.scm | 3 ++- gnu/system/file-systems.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 04f9127346..d6dc792821 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,7 +95,7 @@ loop-back communications.") file-system-/sys/fs/cgroup/cpuset file-system-/sys/fs/cgroup/devices file-system-/sys/fs/cgroup/memory - ; TODO: file-system-/sys/fs/cgroup/pids + file-system-/sys/fs/cgroup/pids networking udev)) (start #~(make-forkexec-constructor diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 3b599efa8e..b41f66e943 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -389,7 +390,7 @@ TARGET in the other system." ;; parent directory. (dependencies (list parent)))) '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" - "blkio" "perf_event"))))) + "blkio" "perf_event" "pids"))))) (define %elogind-file-systems ;; We don't use systemd, but these file systems are needed for elogind, -- 2.26.0