summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorAndrew Tropin <andrew@trop.in>2022-12-01 17:21:39 +0400
committerAndrew Tropin <andrew@trop.in>2022-12-01 18:56:24 +0400
commit0823fd1aa9e63b6021eb04d0d41d5c55ad328ebf (patch)
treee3c40614457fa1057349a6ee94345497eb5405ff /gnu
parent7dddf0cc54b02dfa37884bee49a20eb88a420cba (diff)
services: network-manager: Add iwd backend support.
* gnu/services/networking.scm (network-manager-configuration)[iwd?]: New field. (network-manager-shepherd-service): Add iwd to requirements if needed. * doc/guix.texi: Add information about iwd? option.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/networking.scm13
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index de02f16a34..a2ead9ef11 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2021 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1143,7 +1144,8 @@ project's documentation} for more information."
(dns network-manager-configuration-dns
(default "default"))
(vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
- (default '())))
+ (default '()))
+ (iwd? network-manager-configuration-iwd? (default #f)))
(define network-manager-activation
;; Activation gexp for NetworkManager
@@ -1199,14 +1201,17 @@ project's documentation} for more information."
(define network-manager-shepherd-service
(match-lambda
- (($ <network-manager-configuration> network-manager dns vpn-plugins)
+ (($ <network-manager-configuration> network-manager dns vpn-plugins iwd?)
(let ((conf (plain-file "NetworkManager.conf"
- (string-append "[main]\ndns=" dns "\n")))
+ (string-append
+ "[main]\ndns=" dns "\n"
+ (if iwd? "[device]\nwifi.backend=iwd\n" ""))))
(vpn (vpn-plugin-directory vpn-plugins)))
(list (shepherd-service
(documentation "Run the NetworkManager.")
(provision '(networking))
- (requirement '(user-processes dbus-system wpa-supplicant loopback))
+ (requirement (append '(user-processes dbus-system loopback)
+ (if iwd? '(iwd) '(wpa-supplicant))))
(start #~(make-forkexec-constructor
(list (string-append #$network-manager
"/sbin/NetworkManager")