nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Christopher Baines 2016-12-10 10:21:43 +00:00 committed by Ludovic Courtès
parent 5ce09ef18f
commit 97bb1ab665
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/services.scm
View File

@ -338,12 +338,14 @@ ACTIVATION-SCRIPT-TYPE."
(activate-/bin/sh (activate-/bin/sh
(string-append #$(canonical-package bash) "/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. ;; Run the services' activation snippets.
;; TODO: Use 'load-compiled'. ;; TODO: Use 'load-compiled'.
(for-each primitive-load '#$actions) (for-each primitive-load '#$actions))))))
;; Set up /run/current-system.
(activate-current-system))))))
(define (gexps->activation-gexp gexps) (define (gexps->activation-gexp gexps)
"Return a gexp that runs the activation script containing GEXPS." "Return a gexp that runs the activation script containing GEXPS."