[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: services: dbus: Honor the config's dbus package.
From: |
Ludovic Courtès |
Subject: |
01/04: services: dbus: Honor the config's dbus package. |
Date: |
Wed, 21 Oct 2015 22:46:25 +0000 |
civodul pushed a commit to branch dbus-update
in repository guix.
commit 4a663ca4e8b5ded9a3d92870fba8f2ebde22d75a
Author: Ludovic Courtès <address@hidden>
Date: Wed Oct 21 23:37:02 2015 +0200
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.
---
gnu/services/dbus.scm | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 1fa910a..1d504a8 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)