aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Waegeneire <brice@waegenei.re>2020-07-04 20:54:29 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2021-01-06 19:18:58 +0100
commit3d3185b54448cb44fffc1badc8c1cf51bb76585d (patch)
treef1bde7aeafec91b81279bd6a2a6c108e2c2ee624
parentff1a9f0d17e966746ab84ebf26e1f7e196a2bf12 (diff)
downloadguix-3d3185b54448cb44fffc1badc8c1cf51bb76585d.tar
guix-3d3185b54448cb44fffc1badc8c1cf51bb76585d.tar.gz
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>
-rw-r--r--gnu/services/linux.scm59
1 files changed, 29 insertions, 30 deletions
diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm
index 72c7779596..1046a7e0c2 100644
--- a/gnu/services/linux.scm
+++ b/gnu/services/linux.scm
@@ -147,35 +147,34 @@ representation."
(define kernel-module-loader-shepherd-service
(match-lambda
((and (? list? kernel-modules) ((? string?) ...))
- (list
- (shepherd-service
- (documentation "Load kernel modules.")
- (provision '(kernel-module-loader))
- (requirement '(file-systems))
- (one-shot? #t)
- (modules `((srfi srfi-1)
- (srfi srfi-34)
- (srfi srfi-35)
- (rnrs io ports)
- ,@%default-modules))
- (start
- #~(lambda _
- (cond
- ((null? '#$kernel-modules) #t)
- ((file-exists? "/proc/sys/kernel/modprobe")
- (let ((modprobe (call-with-input-file
- "/proc/sys/kernel/modprobe" get-line)))
- (guard (c ((message-condition? c)
- (format (current-error-port) "~a~%"
- (condition-message c))
- #f))
- (every (lambda (module)
- (invoke/quiet modprobe "--" module))
- '#$kernel-modules))))
- (else
- (format (current-error-port) "error: ~a~%"
- "Kernel is missing loadable module support.")
- #f)))))))))
+ (shepherd-service
+ (documentation "Load kernel modules.")
+ (provision '(kernel-module-loader))
+ (requirement '(file-systems))
+ (one-shot? #t)
+ (modules `((srfi srfi-1)
+ (srfi srfi-34)
+ (srfi srfi-35)
+ (rnrs io ports)
+ ,@%default-modules))
+ (start
+ #~(lambda _
+ (cond
+ ((null? '#$kernel-modules) #t)
+ ((file-exists? "/proc/sys/kernel/modprobe")
+ (let ((modprobe (call-with-input-file
+ "/proc/sys/kernel/modprobe" get-line)))
+ (guard (c ((message-condition? c)
+ (format (current-error-port) "~a~%"
+ (condition-message c))
+ #f))
+ (every (lambda (module)
+ (invoke/quiet modprobe "--" module))
+ '#$kernel-modules))))
+ (else
+ (format (current-error-port) "error: ~a~%"
+ "Kernel is missing loadable module support.")
+ #f))))))))
(define kernel-module-loader-service-type
(service-type
@@ -183,7 +182,7 @@ representation."
(description "Load kernel modules.")
(extensions
(list (service-extension shepherd-root-service-type
- kernel-module-loader-shepherd-service)))
+ (compose list kernel-module-loader-shepherd-service))))
(compose concatenate)
(extend append)
(default-value '())))