aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-02-20 16:25:44 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-16 22:50:14 +0100
commit34d60c49cbffcee2bdaec32f0bfe2fef1c1ea8e6 (patch)
tree2003e63e6bb58d799204d6c75430954cea6bf087 /gnu
parentd938a58beefc669ab340aa1aeab49df3dc24d123 (diff)
downloadpatches-34d60c49cbffcee2bdaec32f0bfe2fef1c1ea8e6.tar
patches-34d60c49cbffcee2bdaec32f0bfe2fef1c1ea8e6.tar.gz
services: connman: Rework service.
* gnu/services/networking.scm (connman-service): Remove. (<connman-configuration>): New record specifying the package to be used (connman) and whether vpn plugin shall be disabled (disable-vpn?). (connman-configuration): New exported variable. (connman-configuration?): New exported variable. (connman-service-type): Export it. * doc/guix.texi (Networking Services): Adjust accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/networking.scm86
1 files changed, 49 insertions, 37 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 18bce2a2b8..9b8e5b36b1 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -80,7 +80,10 @@
network-manager-configuration-dns
network-manager-service-type
- connman-service
+ connman-configuration
+ connman-configuration?
+ connman-service-type
+
wpa-supplicant-service-type
openvswitch-service-type
@@ -822,45 +825,54 @@ dns=" dns "
;;; Connman
;;;
-(define %connman-activation
- ;; Activation gexp for Connman.
- #~(begin
- (use-modules (guix build utils))
- (mkdir-p "/var/lib/connman/")
- (mkdir-p "/var/lib/connman-vpn/")))
-
-(define (connman-shepherd-service connman)
+(define-record-type* <connman-configuration>
+ connman-configuration make-connman-configuration
+ connman-configuration?
+ (connman connman-configuration-connman
+ (default connman))
+ (disable-vpn? connman-configuration-disable-vpn?
+ (default #f)))
+
+(define (connman-activation config)
+ (let ((disable-vpn? (connman-configuration-disable-vpn? config)))
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (mkdir-p "/var/lib/connman/")
+ (unless #$disable-vpn?
+ (mkdir-p "/var/lib/connman-vpn/"))))))
+
+(define (connman-shepherd-service config)
"Return a shepherd service for Connman"
- (list (shepherd-service
- (documentation "Run Connman")
- (provision '(networking))
- (requirement '(user-processes dbus-system loopback wpa-supplicant))
- (start #~(make-forkexec-constructor
- (list (string-append #$connman
- "/sbin/connmand")
- "-n" "-r")))
- (stop #~(make-kill-destructor)))))
+ (and
+ (connman-configuration? config)
+ (let ((connman (connman-configuration-connman config))
+ (disable-vpn? (connman-configuration-disable-vpn? config)))
+ (list (shepherd-service
+ (documentation "Run Connman")
+ (provision '(networking))
+ (requirement
+ '(user-processes dbus-system loopback wpa-supplicant))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$connman
+ "/sbin/connmand")
+ "-n" "-r"
+ #$@(if disable-vpn? '("--noplugin=vpn") '()))))
+ (stop #~(make-kill-destructor)))))))
(define connman-service-type
- (service-type (name 'connman)
- (extensions
- (list (service-extension shepherd-root-service-type
- connman-shepherd-service)
- (service-extension dbus-root-service-type list)
- (service-extension activation-service-type
- (const %connman-activation))
- ;; Add connman to the system profile.
- (service-extension profile-service-type list)))))
-
-(define* (connman-service #:key (connman connman))
- "Return a service that runs @url{https://01.org/connman,Connman}, a network
-connection manager.
-
-This service adds the @var{connman} package to the global profile, providing
-several the @command{connmanctl} command to interact with the daemon and
-configure networking."
- (service connman-service-type connman))
-
+ (let ((connman-package (compose list connman-configuration-connman)))
+ (service-type (name 'connman)
+ (extensions
+ (list (service-extension shepherd-root-service-type
+ connman-shepherd-service)
+ (service-extension dbus-root-service-type
+ connman-package)
+ (service-extension activation-service-type
+ connman-activation)
+ ;; Add connman to the system profile.
+ (service-extension profile-service-type
+ connman-package))))))
;;;