[PATCH 1/1] services: openssh: Parameterize the OpenSSH package used by the service.

[PATCH 1/1] services: openssh: Parameterize the OpenSSH package used by the service.

[Leo Famulari]

* gnu/services/ssh.scm (<openssh-configuration>)[openssh]: New field.
(openssh-activation), (openssh-shepherd-service): Use it.
---
 gnu/services/ssh.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 7b2d4a8f0..c1d42e70c 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -260,6 +260,8 @@ The other options should be self-descriptive."
 (define-record-type* <openssh-configuration>
   openssh-configuration make-openssh-configuration
   openssh-configuration?
+  (openssh               openssh-configuration-openssh ;package
+                         (default openssh))
   (pid-file              openssh-configuration-pid-file
                          (default "/var/run/sshd.pid"))
   (port-number           openssh-configuration-port-number ;integer
@@ -297,7 +299,8 @@ The other options should be self-descriptive."
       (mkdir-p (dirname #$(openssh-configuration-pid-file config)))
 
       ;; Generate missing host keys.
-      (system* (string-append #$openssh "/bin/ssh-keygen") "-A")))
+      (system* (string-append #$(openssh-configuration-openssh config)
+                              "/bin/ssh-keygen") "-A")))
 
 (define (openssh-config-file config)
   "Return the sshd configuration file corresponding to CONFIG."
@@ -342,7 +345,7 @@ The other options should be self-descriptive."
     (openssh-configuration-pid-file config))
 
   (define openssh-command
-    #~(list (string-append #$openssh "/sbin/sshd")
+    #~(list (string-append #$(openssh-configuration-openssh config) "/sbin/sshd")
             "-D" "-f" #$(openssh-config-file config)))
 
   (list (shepherd-service
-- 
2.12.0

Re: [PATCH 1/1] services: openssh: Parameterize the OpenSSH package used by the service.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

On Sun, Mar 05, 2017 at 01:29:23PM -0500, Leo Famulari wrote:
> * gnu/services/ssh.scm (<openssh-configuration>)[openssh]: New field.
> (openssh-activation), (openssh-shepherd-service): Use it.

With this patch, I'm using a custom OpenSSH package in the
openssh-service on my GuixSD system.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/1] services: openssh: Parameterize the OpenSSH package used by the service.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/services/ssh.scm (<openssh-configuration>)[openssh]: New field.
> (openssh-activation), (openssh-shepherd-service): Use it.
                     ^  ^
(Nitpick: no need to close/open parens here.)

It’s a good idea, please push!

Thanks,
Ludo’.