guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: services: Activate system prior to services.


From: Ludovic Courtès
Subject: 01/01: services: Activate system prior to services.
Date: Sun, 11 Dec 2016 09:00:24 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit 97bb1ab66519736afbdab57c230c3a9deef2fa05
Author: Christopher Baines <address@hidden>
Date:   Sat Dec 10 10:21:43 2016 +0000

    services: Activate system prior to services.
    
    * gnu/services.scm (activation-script): Move 'activation-current-system'
    call before (for-each primitive-load …).
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/services.scm |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/services.scm b/gnu/services.scm
index 693a7f8..03112f7 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -338,12 +338,14 @@ ACTIVATION-SCRIPT-TYPE."
                       (activate-/bin/sh
                        (string-append #$(canonical-package bash) "/bin/sh"))
 
+                      ;; Set up /run/current-system.  Among other things this
+                      ;; sets up locales, which the activation snippets
+                      ;; executed below may expect.
+                      (activate-current-system)
+
                       ;; Run the services' activation snippets.
                       ;; TODO: Use 'load-compiled'.
-                      (for-each primitive-load '#$actions)
-
-                      ;; Set up /run/current-system.
-                      (activate-current-system))))))
+                      (for-each primitive-load '#$actions))))))
 
 (define (gexps->activation-gexp gexps)
   "Return a gexp that runs the activation script containing GEXPS."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]