10/13: services: secret-service: Move instance last in the list of services.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e352706ad39a4d14fe9601785bd2fa9d168ad05e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Sep 29 11:13:20 2020 +0200

    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.
---
 gnu/services/virtualization.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index a50cf8b..2410be4 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))))))
 
 
 ;;;