From 97bb1ab66519736afbdab57c230c3a9deef2fa05 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 10 Dec 2016 10:21:43 +0000 Subject: services: Activate system prior to services. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services.scm (activation-script): Move 'activation-current-system' call before (for-each primitive-load …). Signed-off-by: Ludovic Courtès --- gnu/services.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 693a7f8001..03112f7515 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." -- cgit 1.4.1