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.
This commit is contained in:
Mathieu Othacehe 2017-12-22 08:43:24 +01:00
parent c729225b0f
commit 2cf5f4c144
No known key found for this signature in database
GPG key ID: 8354763531769CA6

View file

@ -284,41 +284,42 @@ (define %control-groups
(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