services: kernel-module-loader: Return a single 'shepherd-service'.

* gnu/services/linux.scm (kernel-module-loader-shepherd-service): Return
a 'shepherd-service' instead of a list of it.
(kernel-module-loader-service-type): Adjust it.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Brice Waegeneire 2020-07-04 20:54:29 +02:00 committed by Danny Milosavljevic
parent ff1a9f0d17
commit 3d3185b544
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5

View file

@ -147,7 +147,6 @@ (define earlyoom-service-type
(define kernel-module-loader-shepherd-service (define kernel-module-loader-shepherd-service
(match-lambda (match-lambda
((and (? list? kernel-modules) ((? string?) ...)) ((and (? list? kernel-modules) ((? string?) ...))
(list
(shepherd-service (shepherd-service
(documentation "Load kernel modules.") (documentation "Load kernel modules.")
(provision '(kernel-module-loader)) (provision '(kernel-module-loader))
@ -175,7 +174,7 @@ (define kernel-module-loader-shepherd-service
(else (else
(format (current-error-port) "error: ~a~%" (format (current-error-port) "error: ~a~%"
"Kernel is missing loadable module support.") "Kernel is missing loadable module support.")
#f))))))))) #f))))))))
(define kernel-module-loader-service-type (define kernel-module-loader-service-type
(service-type (service-type
@ -183,7 +182,7 @@ (define kernel-module-loader-service-type
(description "Load kernel modules.") (description "Load kernel modules.")
(extensions (extensions
(list (service-extension shepherd-root-service-type (list (service-extension shepherd-root-service-type
kernel-module-loader-shepherd-service))) (compose list kernel-module-loader-shepherd-service))))
(compose concatenate) (compose concatenate)
(extend append) (extend append)
(default-value '()))) (default-value '())))