diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-07-17 19:25:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-17 19:25:09 +0200 |
| commit | b78cad85d38efc4de3fa11651111dcf4b8467cdf (patch) | |
| tree | d51109ea981e2c478f981f70c3c7661ab2475857 /gnu/system | |
| parent | e51710d1efd406890285907876ad20ec787394b3 (diff) | |
| download | gnu-guix-b78cad85d38efc4de3fa11651111dcf4b8467cdf.tar gnu-guix-b78cad85d38efc4de3fa11651111dcf4b8467cdf.tar.gz | |
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.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/file-systems.scm | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index a3230dce48..003eb443d1 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -237,21 +237,26 @@ UUID representation." (flags '(read-only bind-mount)))) (define %control-groups - (cons (file-system - (device "cgroup") - (mount-point "/sys/fs/cgroup") - (type "tmpfs") - (check? #f)) - (map (lambda (subsystem) - (file-system - (device "cgroup") - (mount-point (string-append "/sys/fs/cgroup/" subsystem)) - (type "cgroup") - (check? #f) - (options subsystem) - (create-mount-point? #t))) - '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" - "blkio" "perf_event" "hugetlb")))) + (let ((parent (file-system + (device "cgroup") + (mount-point "/sys/fs/cgroup") + (type "tmpfs") + (check? #f)))) + (cons parent + (map (lambda (subsystem) + (file-system + (device "cgroup") + (mount-point (string-append "/sys/fs/cgroup/" subsystem)) + (type "cgroup") + (check? #f) + (options subsystem) + (create-mount-point? #t) + + ;; This must be mounted after, and unmounted before the + ;; parent directory. + (dependencies (list parent)))) + '("cpuset" "cpu" "cpuacct" "memory" "devices" "freezer" + "blkio" "perf_event" "hugetlb"))))) (define %base-file-systems ;; List of basic file systems to be mounted. Note that /proc and /sys are |