diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-12 23:19:41 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-14 17:42:08 +0200 |
| commit | c9776d5beca07ba5419f9f6cb68d857290d64b9d (patch) | |
| tree | ed0639d849dc60f97302444ebe72c2c6db86dc54 /gnu | |
| parent | a84510f99bdc6d224f19089d4273563ace57991b (diff) | |
| download | patches-c9776d5beca07ba5419f9f6cb68d857290d64b9d.tar patches-c9776d5beca07ba5419f9f6cb68d857290d64b9d.tar.gz | |
installer: Add wpa-supplicant along with NetworkManager and Connman.
* gnu/installer/services.scm (%system-services) <network-manager,
connman>: Add a 'wpa-supplicant-service-type' instance.
(system-services->configuration): Unsplice it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/installer/services.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index 0e98392bfb..5c708a0e37 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -20,6 +20,7 @@ (define-module (gnu installer services) #:use-module (guix records) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (system-service? system-service-name system-service-type @@ -75,11 +76,13 @@ (system-service (name (G_ "NetworkManager network connection manager")) (type 'network-management) - (snippet '(service network-manager-service-type))) + (snippet '((service network-manager-service-type) + (service wpa-supplicant-service-type)))) (system-service (name (G_ "Connman network connection manager")) (type 'network-management) - (snippet '(service connman-service-type))) + (snippet '((service connman-service-type) + (service wpa-supplicant-service-type)))) (system-service (name (G_ "DHCP client (dynamic IP address assignment)")) (type 'network-management) @@ -95,7 +98,13 @@ (define (system-services->configuration services) "Return the configuration field for SERVICES." - (let* ((snippets (map system-service-snippet services)) + (let* ((snippets (append-map (lambda (service) + (match (system-service-snippet service) + ((and lst (('service _ ...) ...)) + lst) + (sexp + (list sexp)))) + services)) (desktop? (find desktop-system-service? services)) (base (if desktop? '%desktop-services |