me
/
guix
Archived
1
0
Fork 0
Code

file-systems: Subsystem cgroups now depend on /sys/fs/cgroup. 

* gnu/system/file-systems.scm (%control-groups): Define 'parent' variable.
  Initialize the 'dependencies' field for all the subsystems.
master
Ludovic Courtès 2015-07-17 19:25:09 +02:00
parent e51710d1ef
commit b78cad85d3
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/system/file-systems.scm
View File

@ -237,11 +237,12 @@ UUID representation."
(flags '(read-only bind-mount)))) (flags '(read-only bind-mount))))
(define %control-groups (define %control-groups
(cons (file-system (let ((parent (file-system
(device "cgroup") (device "cgroup")
(mount-point "/sys/fs/cgroup") (mount-point "/sys/fs/cgroup")
(type "tmpfs") (type "tmpfs")
(check? #f)) (check? #f))))
(cons parent
(map (lambda (subsystem) (map (lambda (subsystem)
(file-system (file-system
(device "cgroup") (device "cgroup")
@ -249,9 +250,13 @@ UUID representation."
(type "cgroup") (type "cgroup")
(check? #f) (check? #f)
(options subsystem) (options subsystem)
(create-mount-point? #t))) (create-mount-point? #t)
;; This must be mounted after, and unmounted before the
;; parent directory.
(dependencies (list parent))))
'("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer"
"blkio" "perf_event" "hugetlb")))) "blkio" "perf_event" "hugetlb")))))
(define %base-file-systems (define %base-file-systems
;; List of basic file systems to be mounted. Note that /proc and /sys are ;; List of basic file systems to be mounted. Note that /proc and /sys are