branch master updated: services: WPA Supplicant: Conditionally depend on D-Bus.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new d48b17a  services: WPA Supplicant: Conditionally depend on D-Bus.
d48b17a is described below

commit d48b17adb91d68acf6fb3f321c05102fcc8c39eb
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Sep 24 20:18:20 2020 +0200

    services: WPA Supplicant: Conditionally depend on D-Bus.
    
    Fixes <https://bugs.gnu.org/43567>.
    Reported by calcium <calcium@disroot.org>.
    
    * gnu/services/networking.scm (<wpa-supplicant-configuration>)[requirement]:
    Remove 'dbus-system.
    (wpa-supplicant-shepherd-service)[requirement]: Add 'dbus-system when DBUS? 
is true.
    * doc/guix.texi (Networking Services)[wpa-supplicant-service-type]: Adjust
    accordingly.
---
 doc/guix.texi               | 2 +-
 gnu/services/networking.scm | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6b2c749..0fd5694 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14603,7 +14603,7 @@ It takes the following parameters:
 @item @code{wpa-supplicant} (default: @code{wpa-supplicant})
 The WPA Supplicant package to use.
 
-@item @code{requirement} (default: @code{'(user-processes dbus-system loopback 
syslogd)}
+@item @code{requirement} (default: @code{'(user-processes loopback syslogd)}
 List of services that should be started before WPA Supplicant starts.
 
 @item @code{dbus?} (default: @code{#t})
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index e45b116..64f54e7 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1324,7 +1324,7 @@ whatever the thing is supposed to do).")))
   (wpa-supplicant     wpa-supplicant-configuration-wpa-supplicant ;<package>
                       (default wpa-supplicant))
   (requirement        wpa-supplicant-configuration-requirement    ;list of 
symbols
-                      (default '(user-processes dbus-system loopback syslogd)))
+                      (default '(user-processes loopback syslogd)))
   (pid-file           wpa-supplicant-configuration-pid-file       ;string
                       (default "/var/run/wpa_supplicant.pid"))
   (dbus?              wpa-supplicant-configuration-dbus?          ;Boolean
@@ -1343,7 +1343,9 @@ whatever the thing is supposed to do).")))
      (list (shepherd-service
             (documentation "Run the WPA supplicant daemon")
             (provision '(wpa-supplicant))
-            (requirement requirement)
+            (requirement (if dbus?
+                             (cons 'dbus-system requirement)
+                             requirement))
             (start #~(make-forkexec-constructor
                       (list (string-append #$wpa-supplicant
                                            "/sbin/wpa_supplicant")