summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/dns.scm8
-rw-r--r--gnu/services/dns.scm3
2 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 2797821704..0fae953837 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -310,7 +310,13 @@ prompt the user with the option to go with insecure DNS only.")
(list dbus))
(arguments
`(#:phases
- (modify-phases %standard-phases (delete 'configure))
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'install 'install-dbus
+ (lambda _
+ (install-file "dbus/dnsmasq.conf"
+ (string-append %output "/etc/dbus-1/system.d")))))
+
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "CC=" ,(cc-for-target))
(string-append "PKG_CONFIG=" ,(pkg-config-for-target))
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm
index 9a9b78d877..350e3da361 100644
--- a/gnu/services/dns.scm
+++ b/gnu/services/dns.scm
@@ -23,6 +23,7 @@
(define-module (gnu services dns)
#:use-module (gnu services)
#:use-module (gnu services configuration)
+ #:use-module (gnu services dbus)
#:use-module (gnu services shepherd)
#:use-module (gnu system shadow)
#:use-module (gnu packages admin)
@@ -993,6 +994,8 @@ log.")
(extensions
(list (service-extension shepherd-root-service-type
(compose list dnsmasq-shepherd-service))
+ (service-extension dbus-root-service-type
+ (compose list dnsmasq-configuration-package))
(service-extension activation-service-type
dnsmasq-activation)))
(default-value (dnsmasq-configuration))