ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Add wpa-supplicant along with NetworkManager and Connman.

Browse source 
* gnu/installer/services.scm (%system-services) <network-manager,
connman>: Add a 'wpa-supplicant-service-type' instance.
(system-services->configuration): Unsplice it.
This commit is contained in:
Ludovic Courtès 2019-04-12 23:19:41 +02:00
parent a84510f99b
commit c9776d5bec
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/installer/services.scm
View file

@ -20,6 +20,7 @@
(define-module (gnu installer services) (define-module (gnu installer services)
#:use-module (guix records) #:use-module (guix records)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (system-service? #:export (system-service?
system-service-name system-service-name
system-service-type system-service-type
@ -75,11 +76,13 @@ (define %system-services
(system-service (system-service
(name (G_ "NetworkManager network connection manager")) (name (G_ "NetworkManager network connection manager"))
(type 'network-management) (type 'network-management)
(snippet '(service network-manager-service-type))) (snippet '((service network-manager-service-type)
(service wpa-supplicant-service-type))))
(system-service (system-service
(name (G_ "Connman network connection manager")) (name (G_ "Connman network connection manager"))
(type 'network-management) (type 'network-management)
(snippet '(service connman-service-type))) (snippet '((service connman-service-type)
(service wpa-supplicant-service-type))))
(system-service (system-service
(name (G_ "DHCP client (dynamic IP address assignment)")) (name (G_ "DHCP client (dynamic IP address assignment)"))
(type 'network-management) (type 'network-management)
@ -95,7 +98,13 @@ (define (networking-system-service? service)
(define (system-services->configuration services) (define (system-services->configuration services)
"Return the configuration field for 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)) (desktop? (find desktop-system-service? services))
(base (if desktop? (base (if desktop?
'%desktop-services '%desktop-services