summary refs log tree commit diff
path: root/gnu/services/virtualization.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-09-29 11:13:20 +0200
committerLudovic Courtès <ludo@gnu.org>2020-09-29 21:56:27 +0200
commite352706ad39a4d14fe9601785bd2fa9d168ad05e (patch)
tree622bb80fe1ee8f9a8c4a5e44b77bda8d0d6d8efc /gnu/services/virtualization.scm
parentf9090015c58e6f47be74fe6116ef10a90378a899 (diff)
downloadguix-e352706ad39a4d14fe9601785bd2fa9d168ad05e.tar.gz
services: secret-service: Move instance last in the list of services.
* gnu/services/virtualization.scm (secret-service-operating-system): Add
the SECRET-SERVICE-TYPE instance to the end of the list.
Diffstat (limited to 'gnu/services/virtualization.scm')
-rw-r--r--gnu/services/virtualization.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index a50cf8b733..2410be450b 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -841,8 +841,12 @@ can only be accessed by their host.")))
 that will be listening to receive secret keys on port 1004, TCP."
   (operating-system
     (inherit os)
-    (services (cons (service secret-service-type 1004)
-                    (operating-system-user-services os)))))
+    ;; Arrange so that the secret service activation snippet shows up before
+    ;; the OpenSSH and Guix activation snippets.  That way, we receive OpenSSH
+    ;; and Guix keys before the activation snippets try to generate fresh keys
+    ;; for nothing.
+    (services (append (operating-system-user-services os)
+                      (list (service secret-service-type 1004))))))
 
 
 ;;;