me
/
guix
Archived
1
0
Fork 0
Code

services: dnsmasq: Add escape hatch. 

* gnu/service/dns.scm: (<dnsmasq-configuration>)[extra-options]: Add.
* doc/guix.texi: Document (<dnsmasq-configuration>)[extra-options].

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I7d2df7aa5d3b041b69b2f8b3e311a7328c28a3be
master
Sergey Trofimov 2024-05-01 22:43:31 +02:00 committed by Ludovic Courtès
parent 48a82a0d68
commit 10d8bbdabb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -33635,6 +33635,10 @@ separated by dashes, e.g.: @samp{01-02-03-04-aa-bb}. Note that
resolving MAC addresses is only possible if the client is in the local resolving MAC addresses is only possible if the client is in the local
network or obtained a DHCP lease from dnsmasq. network or obtained a DHCP lease from dnsmasq.
@item @code{extra-options} (default: @code{'()})
This option provides an ``escape hatch'' for the user to provide arbitrary
command-line arguments to @command{dnsmasq} as a list of strings.
@end table @end table
@end deftp @end deftp

7
gnu/services/dns.scm
View File

@ -739,6 +739,8 @@ cache.size = 100 * MB
(default #t)) ;boolean (default #t)) ;boolean
(listen-addresses dnsmasq-configuration-listen-address (listen-addresses dnsmasq-configuration-listen-address
(default '())) ;list of string (default '())) ;list of string
(extra-options dnsmasq-configuration-extra-options
(default '())) ;list of string
(resolv-file dnsmasq-configuration-resolv-file (resolv-file dnsmasq-configuration-resolv-file
(default "/etc/resolv.conf")) ;string (default "/etc/resolv.conf")) ;string
(no-resolv? dnsmasq-configuration-no-resolv? (no-resolv? dnsmasq-configuration-no-resolv?
@ -798,7 +800,7 @@ cache.size = 100 * MB
tftp-single-port? tftp-secure? tftp-single-port? tftp-secure?
tftp-max tftp-mtu tftp-no-blocksize? tftp-max tftp-mtu tftp-no-blocksize?
tftp-lowercase? tftp-port-range tftp-lowercase? tftp-port-range
tftp-root tftp-unique-root) tftp-root tftp-unique-root extra-options)
(shepherd-service (shepherd-service
(provision '(dnsmasq)) (provision '(dnsmasq))
(requirement '(networking)) (requirement '(networking))
@ -877,7 +879,8 @@ cache.size = 100 * MB
(if (> (length tftp-unique-root) 0) (if (> (length tftp-unique-root) 0)
(format #f "--tftp-unique-root=~a" tftp-unique-root) (format #f "--tftp-unique-root=~a" tftp-unique-root)
(format #f "--tftp-unique-root"))) (format #f "--tftp-unique-root")))
'())) '())
#$@extra-options)
#:pid-file "/run/dnsmasq.pid")) #:pid-file "/run/dnsmasq.pid"))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))