diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-26 17:58:58 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-27 14:14:47 +0200 |
| commit | 2ef4d273d13faccbc9e11a74cfdbd0a9f4f1c898 (patch) | |
| tree | 91fafda544452f092547347fc3365a12d0d85a9e | |
| parent | 639ae3f20bea5ccd7f4a4df7a828569639220e79 (diff) | |
| download | guix-2ef4d273d13faccbc9e11a74cfdbd0a9f4f1c898.tar guix-2ef4d273d13faccbc9e11a74cfdbd0a9f4f1c898.tar.gz | |
file-systems: mount the PID cgroup filesystem.
* 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.
| -rw-r--r-- | gnu/services/docker.scm | 3 | ||||
| -rw-r--r-- | 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 <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, |