summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-10-21 23:37:02 +0200
committerLudovic Courtès <ludo@gnu.org>2015-10-21 23:37:02 +0200
commit4a663ca4e8b5ded9a3d92870fba8f2ebde22d75a (patch)
tree3a2c0c7e33797bf407f7451ef72a52afb262218d
parent5e3bfe9d018f42324c19a5486e91d922cde40db6 (diff)
downloadpatches-4a663ca4e8b5ded9a3d92870fba8f2ebde22d75a.tar
patches-4a663ca4e8b5ded9a3d92870fba8f2ebde22d75a.tar.gz
services: dbus: Honor the config's dbus package.
* gnu/services/dbus.scm (dbus-dmd-service): Rewrite using 'match-lambda' so that the config's dbus package is used. Fixes a regression introduced in 64643b9.
-rw-r--r--gnu/services/dbus.scm20
1 files changed, 11 insertions, 9 deletions
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 1fa910af56..1d504a8309 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -118,15 +118,17 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in
(execl prog)))
(waitpid pid)))))))
-(define (dbus-dmd-service config)
- (list (dmd-service
- (documentation "Run the D-Bus system daemon.")
- (provision '(dbus-system))
- (requirement '(user-processes))
- (start #~(make-forkexec-constructor
- (list (string-append #$dbus "/bin/dbus-daemon")
- "--nofork" "--system")))
- (stop #~(make-kill-destructor)))))
+(define dbus-dmd-service
+ (match-lambda
+ (($ <dbus-configuration> dbus)
+ (list (dmd-service
+ (documentation "Run the D-Bus system daemon.")
+ (provision '(dbus-system))
+ (requirement '(user-processes))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$dbus "/bin/dbus-daemon")
+ "--nofork" "--system")))
+ (stop #~(make-kill-destructor)))))))
(define dbus-root-service-type
(service-type (name 'dbus)