diff mbox series

[bug#40871] file-systems: mount the PID cgroup filesystem.

Message ID 20200426155858.15674-1-kuba@kadziolka.net
State Accepted
Headers show
Series [bug#40871] file-systems: mount the PID cgroup filesystem. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Maja Kądziołka April 26, 2020, 3:58 p.m. UTC 
* 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(-)

Comments

Mathieu Othacehe April 27, 2020, 6:41 a.m. UTC | #1 
Hello Jakub,

This looks good to me.

Thanks,

Mathieu
Maja Kądziołka April 27, 2020, 12:16 p.m. UTC | #2 
On Mon, Apr 27, 2020 at 08:41:50AM +0200, Mathieu Othacehe wrote:
> 
> Hello Jakub,
> 
> This looks good to me.
> 
> Thanks,
> 
> Mathieu

Thanks for taking a look! I pushed the patch as commit
2ef4d273d13faccbc9e11a74cfdbd0a9f4f1c898.

Cheers!
diff mbox series

Patch

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 <dannym@scratchpost.org>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;;
 ;;; 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 <ludo@gnu.org>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;;
 ;;; 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,