diff options
author | Brice Waegeneire <brice@waegenei.re> | 2020-04-23 14:00:02 +0200 |
---|---|---|
committer | Guix Patches Tester <> | 2020-04-23 13:02:09 +0100 |
commit | 2f68aac650d255461870082233c7e26946c30ff7 (patch) | |
tree | 48535feefbf862425ea3cbd688167c06b3f31483 /gnu/system.scm | |
parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
download | patches-2f68aac650d255461870082233c7e26946c30ff7.tar patches-2f68aac650d255461870082233c7e26946c30ff7.tar.gz |
services: Add file system utilities to profile.series-3641
* gnu/services/base.scm (file-system-type->utilities,
file-system-utilities): New procedures.
(file-system-service-type): Extend 'profile-service-type' with
'file-system-utilities'.
* gnu/system.scm (boot-file-system-service): New procedure...
(operating-system-default-essential-services): ...use it.
(%base-packages): Remove 'e2fsprogs'.
* gnu/system/file-systems.scm (file-system): Add 'utilities?' field.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 29e622872d..3b8a1c4822 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -424,6 +424,14 @@ marked as 'needed-for-boot'." (service file-system-service-type (map add-dependencies file-systems))) +(define (boot-file-system-service os) + "Return a service which adds, to the system profile, packages providing the +utilites for the file systems marked as 'needed-for-boot' in OS." + (let ((file-systems (filter file-system-needed-for-boot? + (operating-system-file-systems os)))) + (simple-service 'boot-file-system-utilities profile-service-type + (file-system-utilities file-systems)))) + (define (mapped-device-users device file-systems) "Return the subset of FILE-SYSTEMS that use DEVICE." (let ((target (string-append "/dev/mapper/" (mapped-device-target device)))) @@ -519,13 +527,14 @@ bookkeeping." (define known-fs (map file-system-mount-point (operating-system-file-systems os))) - (let* ((mappings (device-mapping-services os)) - (root-fs (root-file-system-service)) - (other-fs (non-boot-file-system-service os)) - (swaps (swap-services os)) - (procs (service user-processes-service-type)) - (host-name (host-name-service (operating-system-host-name os))) - (entries (operating-system-directory-base-entries os))) + (let* ((mappings (device-mapping-services os)) + (root-fs (root-file-system-service)) + (boot-fs (boot-file-system-service os)) + (non-boot-fs (non-boot-file-system-service os)) + (swaps (swap-services os)) + (procs (service user-processes-service-type)) + (host-name (host-name-service (operating-system-host-name os))) + (entries (operating-system-directory-base-entries os))) (cons* (service system-service-type entries) %boot-service @@ -552,7 +561,7 @@ bookkeeping." (operating-system-setuid-programs os)) (service profile-service-type (operating-system-packages os)) - other-fs + boot-fs non-boot-fs (append mappings swaps ;; Add the firmware service. @@ -645,8 +654,7 @@ of PROVENANCE-SERVICE-TYPE to its services." (define %base-packages ;; Default set of packages globally visible. It should include anything ;; required for basic administrator tasks. - (append (list e2fsprogs) - %base-packages-interactive + (append %base-packages-interactive %base-packages-linux %base-packages-networking %base-packages-utils)) |