[PATCH] file-systems: mount the PID cgroup filesystem.

DoneSubmitted by Jakub Kądziołka.
Details
2 participants
  • Jakub Kądziołka
  • Mathieu Othacehe
Owner
unassigned
Severity
normal
J
J
Jakub Kądziołka wrote on 26 Apr 2020 17:58
(address . guix-patches@gnu.org)
20200426155858.15674-1-kuba@kadziolka.net
* 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(-)

Toggle diff (42 lines)
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,
-- 
2.26.0
M
M
Mathieu Othacehe wrote on 27 Apr 2020 08:41
(name . Jakub Kądziołka)(address . kuba@kadziolka.net)(address . 40871@debbugs.gnu.org)
87lfmhwhu9.fsf@gmail.com
Hello Jakub,

This looks good to me.

Thanks,

Mathieu
J
J
Jakub Kądziołka wrote on 27 Apr 2020 14:16
(name . Mathieu Othacehe)(address . m.othacehe@gmail.com)(address . 40871@debbugs.gnu.org)
20200427121600.jgo7ailom5yklypk@gravity
On Mon, Apr 27, 2020 at 08:41:50AM +0200, Mathieu Othacehe wrote:
Toggle quote (9 lines)
>
> Hello Jakub,
>
> This looks good to me.
>
> Thanks,
>
> Mathieu

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

Cheers!
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl6mzP8ACgkQ4xWnWEYT
FWSIuRAAp2MsoWkSeDK+Xz5dT8Z/lZYBySXYelH2+7lX1RR5HahYR3G2fG0Hw7WH
/3K1984llggy6vQ0uSGst5WQk7SwtpkRbcCzMn1My3p385NSb9oNnr3c3s1KKCHT
fM9u5s7cJPhbUtKvYx1cH30glpiHsKNi61IYea1jyI/H1w7yfZAwsWWmqEV7jzvm
P8HekxWTy3v1hKMuQqudUebTwI1sNeskTH9bmyxoXgEyM0pszBgNtDlf5E6J4M9I
mYqDR0VkMfNLMo8rwhy0CgHptpPXg0WklRCBYxEjCcStZ37Pg2F1/8Cgc73v8GCg
gHCREWFKvM7y772WtRK2YEgGM5+69XW+a7U0h1EnVyBVHjJ52rSD8hmIrRZLf2OB
5b+KFdqs+6kxvUwByJAk/ju7KRpTC1czTm7Jdxecx1TWX2MIM3N8L3sIewhBWOeD
52TNoBRquSR14e0UXyGG8ezo1rGq0SshvD4VLTBYJJn5H8fjgVm70cTjhFyarCPa
KrheE508sY4Fut2oAAPwkfYfCaBcZvzRIImdON31s75wiUo3oU7q36SLNIZTZDx7
UWwaRT72g80svuKw1belV0rjDp5HT9OExs9zNsR7Vxu+xnmK4PhK6srcOolq+6uM
IXzxL5DGTJtpbZHoKL1/rO/kBuXStPctNWPYBj/M3uEvGnBIN9E=
=r2XX
-----END PGP SIGNATURE-----


J
J
Jakub Kądziołka wrote on 27 Apr 2020 14:16
close 40871
(address . control@debbugs.gnu.org)
20200427121621.qlotbgaefre5uner@gravity
close 40871
thanks
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl6mzRUACgkQ4xWnWEYT
FWRfrA/+Oqzl+mxw6gaJajBiqR88ruOnm0ymhe4LGkblLD5vQkIFuF6V2CAxf1rh
WTpZvKN0J5krdaywknya/3aPAPdSgTIIT3H5B+ygmaJQlB4/kOR8KgCEeVYGdlIy
ZWVRvArO6J8sK9Ifmw8KIBfTuKnKK5HdprPysfxQq9I6n6RmQsR1Q2cQq8xfbYgi
OyXhpm/6ZS0ppDpIL/n8DBEN8Wm1ni+d560Ba9DnFjjor/WI1kCRhi29s76mibGW
SWpygI+4OdctGZWh9y6NWy9lI4rpPuoKR5aOgrS7FQakie9DbBWZx30ZlXdmxN61
JSjhN6novNrDnQpNpcFehxjWIICbuha0kMbfXJCfcvkvf6qr/kHyPhaAbKc5E18D
i/X4auQb4nKm+ddc9vJ/nZXSs+bWS07N5bsnrDus/28oJaF/YhSBXfuV3qxFmNXl
lDZXBhCMJGGZu2yMtETAw4TnvhzNX8vcsMCCsNgqsdoYqZHBlmZ8CTZRh1m8Wh4f
PdsJN9VgaxlfusFE5ciEhjGSOs+vtqyivOuUq6LATAhE6vlq+9EVvlCgVirkLFQB
8ewKWuA3PExKo5lAUHQjcLiWYMZQTAGq8zozPJWkkjcHp7S/UzElU8KuKTcvVnPV
dy1GhU7KiHd2UTtgIvwRrpfsCGGs5QgpiuEeJsd+wpVymg/g7vc=
=NYm7
-----END PGP SIGNATURE-----


?
Your comment

This issue is archived.

To comment on this conversation send email to 40871@debbugs.gnu.org