From 896a51258aa71a483d8f6be29169098de5967baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 20 May 2023 15:41:07 +0200
Subject: [PATCH] services: Transient inetd services inherit requirements.

That way, per-connection transient services such as 'sshd-123' inherit
dependencies of their "parent" ('sshd' in this example), which is more
consistent than not depending on anything.

* gnu/services/dict.scm (dicod-shepherd-service): Pass #:requirements to
'make-inetd-constructor'.
* gnu/services/messaging.scm (bitlbee-shepherd-service): Likewise.
* gnu/services/ssh.scm (openssh-shepherd-service): Likewise.
* gnu/services/vnc.scm (xvnc-shepherd-service): Likewise.
---
 gnu/services/dict.scm      | 1 +
 gnu/services/messaging.scm | 1 +
 gnu/services/ssh.scm       | 3 ++-
 gnu/services/vnc.scm       | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 28add4b06a..90d3c35b6c 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -176,6 +176,7 @@ (define (dicod-shepherd-service config)
                                 (addrinfo:addr
                                  (car (getaddrinfo #$(first interfaces)
                                                    "dict")))))
+                         #:requirements '#$requirement
                          #:user "dicod" #:group "dicod"
                          #:service-name-stem "dicod")
                         (make-forkexec-constructor
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 3a48cd81f6..c4963936a0 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -872,6 +872,7 @@ (define bitlbee-shepherd-service
                                                         #$(number->string port)
                                                         (logior AI_NUMERICHOST
                                                                 AI_NUMERICSERV))))))
+                              #:requirements '#$requirement
                               #:service-name-stem "bitlbee"
                               #:user "bitlbee" #:group "bitlbee"
 
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 303beed9ff..0abecd6b42 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2019, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2019, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@@ -607,6 +607,7 @@ (define ipv6-support?
                                    (make-socket-address AF_INET6 IN6ADDR_ANY
                                                         #$port-number)))
                                  '()))
+                       #:requirements '#$requirement
                        #:max-connections #$max-connections)
                       (make-forkexec-constructor #$openssh-command
                                                  #:pid-file #$pid-file)))
diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm
index d57cf51af2..f90bd7258f 100644
--- a/gnu/services/vnc.scm
+++ b/gnu/services/vnc.scm
@@ -228,6 +228,7 @@ (define (xvnc-shepherd-service config)
                        ,@(if ipv6-socket
                              (list (endpoint ipv6-socket))
                              '()))
+                     #:requirements '#$requirement
                      #:user "xvnc"
                      #:group "xvnc"))
                 #~(make-forkexec-constructor