diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-12-22 08:43:24 +0100 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-12-22 15:03:10 +0100 |
commit | 2cf5f4c144556dd2edd45d9bc4316cf6a9a5b7b3 (patch) | |
tree | a2b7697e4b0c44799d271d301f447af83f786712 /gnu/system | |
parent | c729225b0f4fd3d7cbbc7bdbc152cf6ee228a77a (diff) | |
download | guix-2cf5f4c144556dd2edd45d9bc4316cf6a9a5b7b3.tar.gz |
file-systems: Move %control-groups from %base-file-systems to
%elogind-file-systems. * gnu/system/file-systems.scm (%base-file-systems): Move %control-groups from here, to ... (%elogind-file-systems): ... here.
Diffstat (limited to 'gnu/system')
-rw-r--r-- | gnu/system/file-systems.scm | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 9de465167d..7f5afb00fe 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -284,41 +284,42 @@ TARGET in the other system." (define %elogind-file-systems ;; We don't use systemd, but these file systems are needed for elogind, ;; which was extracted from systemd. - (list (file-system - (device "none") - (mount-point "/run/systemd") - (type "tmpfs") - (check? #f) - (flags '(no-suid no-dev no-exec)) - (options "mode=0755") - (create-mount-point? #t)) - (file-system - (device "none") - (mount-point "/run/user") - (type "tmpfs") - (check? #f) - (flags '(no-suid no-dev no-exec)) - (options "mode=0755") - (create-mount-point? #t)) - ;; Elogind uses cgroups to organize processes, allowing it to map PIDs - ;; to sessions. Elogind's cgroup hierarchy isn't associated with any - ;; resource controller ("subsystem"). - (file-system - (device "cgroup") - (mount-point "/sys/fs/cgroup/elogind") - (type "cgroup") - (check? #f) - (options "none,name=elogind") - (create-mount-point? #t) - (dependencies (list (car %control-groups)))))) + (append + (list (file-system + (device "none") + (mount-point "/run/systemd") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)) + (file-system + (device "none") + (mount-point "/run/user") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)) + ;; Elogind uses cgroups to organize processes, allowing it to map PIDs + ;; to sessions. Elogind's cgroup hierarchy isn't associated with any + ;; resource controller ("subsystem"). + (file-system + (device "cgroup") + (mount-point "/sys/fs/cgroup/elogind") + (type "cgroup") + (check? #f) + (options "none,name=elogind") + (create-mount-point? #t) + (dependencies (list (car %control-groups))))) + %control-groups)) (define %base-file-systems ;; List of basic file systems to be mounted. Note that /proc and /sys are ;; currently mounted by the initrd. - (append (list %pseudo-terminal-file-system - %shared-memory-file-system - %immutable-store) - %control-groups)) + (list %pseudo-terminal-file-system + %shared-memory-file-system + %immutable-store)) ;; File systems for Linux containers differ from %base-file-systems in that ;; they impose additional restrictions such as no-exec or need different |