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/services.scm | |
| parent | 5ce09ef18ffa35fe90a5f3c674bd91151a4338fb (diff) | |
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/services.scm')
| -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 693a7f8001a..03112f75158 100644 --- a/gnu/services.scm +++ b/gnu/services.scm | |||
| @@ -338,12 +338,14 @@ ACTIVATION-SCRIPT-TYPE." | |||
| 338 | (activate-/bin/sh | 338 | (activate-/bin/sh |
| 339 | (string-append #$(canonical-package bash) "/bin/sh")) | 339 | (string-append #$(canonical-package bash) "/bin/sh")) |
| 340 | 340 | ||
| 341 | ;; Set up /run/current-system. Among other things this | ||
| 342 | ;; sets up locales, which the activation snippets | ||
| 343 | ;; executed below may expect. | ||
| 344 | (activate-current-system) | ||
| 345 | |||
| 341 | ;; Run the services' activation snippets. | 346 | ;; Run the services' activation snippets. |
| 342 | ;; TODO: Use 'load-compiled'. | 347 | ;; TODO: Use 'load-compiled'. |
| 343 | (for-each primitive-load '#$actions) | 348 | (for-each primitive-load '#$actions)))))) |
| 344 | |||
| 345 | ;; Set up /run/current-system. | ||
| 346 | (activate-current-system)))))) | ||
| 347 | 349 | ||
| 348 | (define (gexps->activation-gexp gexps) | 350 | (define (gexps->activation-gexp gexps) |
| 349 | "Return a gexp that runs the activation script containing GEXPS." | 351 | "Return a gexp that runs the activation script containing GEXPS." |
