diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 21:21:05 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 21:21:05 +0100 |
commit | d8fa1890c705ca566a56b69a4880a10dc7cf0098 (patch) | |
tree | c3f220949e5364d981a4895477249ad46852eea0 /gnu/system.scm | |
parent | 5de561a79634e0814ea22f1cfece9a09efa120be (diff) | |
parent | fee7f8a94ec64943109ba9c37f75c28749fb18bd (diff) | |
download | guix-d8fa1890c705ca566a56b69a4880a10dc7cf0098.tar guix-d8fa1890c705ca566a56b69a4880a10dc7cf0098.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 3 |
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 |