aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-09-24 20:18:20 +0200
committerMarius Bakke <marius@gnu.org>2020-09-24 20:18:20 +0200
commitd48b17adb91d68acf6fb3f321c05102fcc8c39eb (patch)
tree8ef56f564177700a14c354de7c05f318b2fb5cd5 /gnu
parentd14a3e5c0c5b7b5e2d4efcc5076abbe9e4c03f50 (diff)
downloadguix-d48b17adb91d68acf6fb3f321c05102fcc8c39eb.tar.gz
guix-d48b17adb91d68acf6fb3f321c05102fcc8c39eb.zip
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/networking.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index e45b116218..64f54e787f 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")