From: iyzsong@member.fsf.org (宋文武)
To: guix-devel@gnu.org
Subject: [PATCH] services: dbus: Build '/etc/dbus-1/system-local.conf'.
Date: Sun, 18 Oct 2015 14:44:42 +0800 [thread overview]
Message-ID: <87r3ks4qw5.fsf@member.fsf.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 91 bytes --]
This patch is for the 'dbus-update' branch, I test with
%desktop-services, it seem works.
[-- Attachment #2: 0001-services-dbus-Build-etc-dbus-1-system-local.conf.patch --]
[-- Type: text/x-patch, Size: 4425 bytes --]
From 96e156d36444b197bb5d07d8d680ec4e85863f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 18 Oct 2015 14:18:52 +0800
Subject: [PATCH] services: dbus: Build '/etc/dbus-1/system-local.conf'.
* gnu/services/dbus.scm (dbus-etc-files): New procedure.
(dbus-dmd-service): Remove the use of '--config-file'.
(dbus-configuration-directory): Adjust accordingly.
(dbus-root-service-type): Add extension of ETC-SERVICE-TYPE.
---
gnu/services/dbus.scm | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index e4ecd96..1fa910a 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,9 +42,9 @@
(services dbus-configuration-services ;list of <package>
(default '())))
-(define (dbus-configuration-directory dbus services)
- "Return a configuration directory for @var{dbus} that includes the
-@code{etc/dbus-1/system.d} directories of each package listed in
+(define (dbus-configuration-directory services)
+ "Return a directory contains the @code{system-local.conf} file for DBUS that
+includes the @code{etc/dbus-1/system.d} directories of each package listed in
@var{services}."
(define build
#~(begin
@@ -65,13 +66,6 @@
services)))
(mkdir #$output)
- (copy-file (string-append #$dbus "/etc/dbus-1/system.conf")
- (string-append #$output "/system.conf"))
-
- ;; The default 'system.conf' has an <includedir> clause for
- ;; 'system.d', so create it.
- (mkdir (string-append #$output "/system.d"))
-
;; 'system-local.conf' is automatically included by the default
;; 'system.conf', so this is where we stuff our own things.
(call-with-output-file (string-append #$output "/system-local.conf")
@@ -81,6 +75,12 @@
(computed-file "dbus-configuration" build))
+(define (dbus-etc-files config)
+ "Return a list of FILES for @var{etc-service-type} to build the
+@code{/etc/dbus-1} directory."
+ (list `("dbus-1" ,(dbus-configuration-directory
+ (dbus-configuration-services config)))))
+
(define %dbus-accounts
;; Accounts used by the system bus.
(list (user-group (name "messagebus") (system? #t))
@@ -118,20 +118,15 @@
(execl prog)))
(waitpid pid)))))))
-(define dbus-dmd-service
- (match-lambda
- (($ <dbus-configuration> dbus services)
- (let ((conf (dbus-configuration-directory dbus services)))
- (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"
- (string-append "--config-file=" #$conf
- "/system.conf"))))
- (stop #~(make-kill-destructor))))))))
+(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-root-service-type
(service-type (name 'dbus)
@@ -140,6 +135,8 @@
dbus-dmd-service)
(service-extension activation-service-type
dbus-activation)
+ (service-extension etc-service-type
+ dbus-etc-files)
(service-extension account-service-type
(const %dbus-accounts))))
--
2.5.0
next reply other threads:[~2015-10-18 6:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-18 6:44 宋文武 [this message]
2015-10-18 17:37 ` [PATCH] services: dbus: Build '/etc/dbus-1/system-local.conf' Ludovic Courtès
2015-10-21 22:52 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r3ks4qw5.fsf@member.fsf.org \
--to=iyzsong@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.