services: network-manager: Allow dnsmasq configuration.

When using (dns "dnsmasq"), configuration is achieved through the
/etc/NetworkManager/dnsmasq.d directory.  The new field parallels
extra-configuration-files for configuration of NetworkManager itself.

* gnu/services/networking.scm (network-manager-configuration)
<dnsmasq-configuration-files>: New field.
* doc/guix.texi (Networking Setup): Document it.

Change-Id: I31d772939e4e1d65f3ff407d70a87a64a047aac6
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 1e85ed97e58..c8a7ce21c95 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1468,12 +1468,15 @@ project's documentation} for more information."
         (sanitize warn-iwd?-field-deprecation))
   (extra-configuration-files
    network-manager-configuration-extra-configuration-files
-   (default '())))                 ;'((file-name-string file-like-object) ...)
+   (default '()))                 ;'((file-name-string file-like-object) ...)
+  (dnsmasq-configuration-files
+   network-manager-configuration-dnsmasq-configuration-files
+   (default '())))
 
 (define (network-manager-activation config)
   ;; Activation gexp for NetworkManager
   (match-record config <network-manager-configuration>
-                (network-manager dns vpn-plugins extra-configuration-files)
+                (network-manager dns vpn-plugins extra-configuration-files dnsmasq-configuration-files)
     #~(begin
         (use-modules (guix build utils))
         (mkdir-p "/etc/NetworkManager/system-connections")
@@ -1481,6 +1484,19 @@ project's documentation} for more information."
                ;; create directory to store dnsmasq lease file
                '((mkdir-p "/var/lib/misc"))
                '())
+        #$@(if (pair? dnsmasq-configuration-files)  ;if non-empty
+               ;; If /etc/NetworkManager/dnsmasq.d is a symlink to a store file,
+               ;; delete it.
+               `((if (and (file-exists? "/etc/NetworkManager/dnsmasq.d")
+                          (store-file-name?
+                           (canonicalize-path "/etc/NetworkManager/dnsmasq.d")))
+                     (delete-file-recursively
+                      "/etc/NetworkManager/dnsmasq.d"))
+                 (symlink
+                  ,(file-union "network-manager-dnsmasq-configuration-directory"
+                               dnsmasq-configuration-files)
+                  "/etc/NetworkManager/dnsmasq.d"))
+               '())
         #$@(if (pair? extra-configuration-files)  ;if non-empty
                ;; If /etc/NetworkManager/conf.d is a symlink to a store file,
                ;; delete it.