aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-07 10:00:07 +0100
committerLudovic Courtès <ludo@gnu.org>2018-03-07 11:22:42 +0100
commit6c4458172d12dbda969c2eae5b3b6be19a068780 (patch)
tree6f1421d919d64a8aaa0eb9c816a9c8463748f4c9 /gnu/system.scm
parent366ddc1ac549efee9acd1fddd30c9baee89ec18a (diff)
downloadguix-6c4458172d12dbda969c2eae5b3b6be19a068780.tar
guix-6c4458172d12dbda969c2eae5b3b6be19a068780.tar.gz
services: file-systems: Include 'user-file-systems' service.
Previously the KNOWN-FS value used in 'essential-services' would be incomplete: it would lack all the file systems provided by services that extend 'file-system-service-type' (/sys/fs/cgroup, /proc/sys/fs/binfmt_misc, etc.) Consequently, upon shutdown, 'user-processes' would unmount these file systems before their corresponding service had been stopped; when their corresponding (e.g., 'file-system-/proc/sys/fs/binfmt_misc') was stopped, its 'umount' call would fail. This was harmless in practice, but this patch makes sure things work as intended and file systems are unmounted in the right order. * gnu/services/base.scm (file-system-shepherd-services): Instantiate 'user-file-systems' Shepherd service from here. (user-unmount-service-type, user-unmount-service): Remove. * gnu/system.scm (essential-services): Remove call to 'user-unmount-service'. * gnu/system/install.scm (cow-store-service-type): Adjust comment.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 1bcc1e1384..eb4b63c428 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -453,7 +453,6 @@ a container or that of a \"bare metal\" system."
(let* ((mappings (device-mapping-services os))
(root-fs (root-file-system-service))
(other-fs (non-boot-file-system-service os))
- (unmount (user-unmount-service known-fs))
(swaps (swap-services os))
(procs (service user-processes-service-type))
(host-name (host-name-service (operating-system-host-name os)))
@@ -478,7 +477,7 @@ a container or that of a \"bare metal\" system."
(service fstab-service-type '())
(session-environment-service
(operating-system-environment-variables os))
- host-name procs root-fs unmount
+ host-name procs root-fs
(service setuid-program-service-type
(operating-system-setuid-programs os))
(service profile-service-type