diff options
| author | Christopher Baines <mail@cbaines.net> | 2016-12-10 10:21:43 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-11 09:31:34 +0100 |
| commit | 97bb1ab66519736afbdab57c230c3a9deef2fa05 (patch) | |
| tree | f6cc752c6e727846e8ac7218fa40db111f3b311a /gnu | |
| parent | 5ce09ef18ffa35fe90a5f3c674bd91151a4338fb (diff) | |
| download | guix-97bb1ab66519736afbdab57c230c3a9deef2fa05.tar.gz guix-97bb1ab66519736afbdab57c230c3a9deef2fa05.zip | |
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 <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services.scm | 10 |
1 files 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." |