Merge remote-tracking branch 'origin/master' into wip-guile-ssh-0.16

1 files changed, 9 insertions, 5 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index c031c8d880..fd03da8c97 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25729,6 +25729,11 @@ Data type representing the configuration of opensmtpd.
 @item @code{package} (default: @var{opensmtpd})
 Package object of the OpenSMTPD SMTP server.
 
+@item @code{shepherd-requirement} (default: @code{'()})
+This option can be used to provide a list of symbols naming Shepherd services
+that this service will depend on, such as @code{'networking}
+if you want to configure OpenSMTPD to listen on non-loopback interfaces.
+
 @item @code{config-file} (default: @code{%default-opensmtpd-config-file})
 File-like object of the OpenSMTPD configuration file to use.  By default
 it listens on the loopback network interface, and allows for mail from
@@ -39719,11 +39724,10 @@ The service type for an @emph{extensible} service looks like this:
 
                 (compose concatenate)       ;concatenate the list of rules
                 (extend (lambda (config rules)
-                          (match config
-                            (($ <udev-configuration> udev initial-rules)
-                             (udev-configuration
-                              (udev udev)   ;the udev package to use
-                              (rules (append initial-rules rules)))))))))
+                          (udev-configuration
+                           (inherit config)
+                           (rules (append (udev-configuration-rules config)
+                                          rules)))))))
 @end lisp
 
 This is the service type for the