diff mbox series

[bug#78546,v2,4/5] services: network-manager: Require wireless-daemon.

Message ID 70e373df86451559144b1399fb392ee39066048e.1748091536.git.sarg@sarg.org.ru
State New
Headers
Series [bug#78546,v2,1/5] services: configuration: Add define-enumerated-field-type helper. |

Commit Message

Sergey Trofimov May 24, 2025, 1:01 p.m. UTC 
  * gnu/services/networking.scm
(<network-manager-configuration>)[shepherd-requirement]:
Replace wpa-supplicant with wireless-daemon.
* doc/guix.texi (Networking Setup): Adjust.

Change-Id: Id1a51429ccb6ea24839fc2aacd051a3ffe91c33c
---
 doc/guix.texi               | 11 ++++++-----
 gnu/services/networking.scm |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index a3956172bc..a9c815c35c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22047,11 +22047,12 @@  Networking Setup
 @item @code{network-manager} (default: @code{network-manager})
 The NetworkManager package to use.
 
-@item @code{shepherd-requirement} (default: @code{'(wpa-supplicant)})
-This option can be used to provide a list of symbols naming Shepherd services
-that this service will depend on, such as @code{'wpa-supplicant} or
-@code{'iwd} if you require authenticated access for encrypted WiFi or Ethernet
-networks.
+@item @code{shepherd-requirement} (default: @code{'(wireless-daemon)})
+This option can be used to provide a list of symbols naming Shepherd
+services that this service will depend on. The default @code{'wireless-daemon}
+is provided by @code{'wpa-supplicant-service-type} and @code{'iwd-service-type}.
+Make sure you have one of these configured. Note, that @code{%desktop-services}
+already include @code{wpa-supplicant-service-type}.
 
 @item @code{dns} (default: @code{"default"})
 Processing mode for DNS, which affects how NetworkManager uses the
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 582c0edd32..900790ef2d 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1417,7 +1417,7 @@  (define-record-type* <network-manager-configuration>
   (network-manager network-manager-configuration-network-manager
                    (default network-manager))
   (shepherd-requirement network-manager-configuration-shepherd-requirement
-                        (default '(wpa-supplicant)))
+                        (default '(wireless-daemon)))
   (dns network-manager-configuration-dns
        (default "default"))
   (vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like