diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2023-08-11 20:19:52 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2023-08-11 20:19:52 +0800 |
| commit | 770f3f587d35e32aba3c6cb0b606f2d2fe8d5ace (patch) | |
| tree | 7e15565a6959867d4bb1bdaf446bbfaff6235259 /gnu/system | |
| parent | 446ec58af67910191be1be06efda6c43fc3cf8d7 (diff) | |
| parent | ad4520b92662e42d7d0b1e648b2068300dbb95c8 (diff) | |
| download | guix-770f3f587d35e32aba3c6cb0b606f2d2fe8d5ace.tar.gz | |
Merge remote-tracking branch 'origin/master' into kde-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/file-systems.scm | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 0ff5a0dcf6..95b757a698 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -445,26 +445,13 @@ TARGET in the other system." (flags '(read-only bind-mount no-atime)))) (define %control-groups - (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" "pids"))))) + ;; The cgroup2 file system. + (list (file-system + (device "none") + (mount-point "/sys/fs/cgroup") + (type "cgroup2") + (check? #f) + (create-mount-point? #f)))) (define %elogind-file-systems ;; We don't use systemd, but these file systems are needed for elogind, |