aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-04 22:42:09 +0100
committerLudovic Courtès <ludo@gnu.org>2016-01-05 00:28:42 +0100
commit94af9daa73f600f8c96d787f425351c090ffd63f (patch)
treeaba4862d2918e01ee42de17cc0f85a7b4f5564a4 /gnu
parentdb5a94445f3b21b307c73ea72ed495bda891ef28 (diff)
downloadguix-94af9daa73f600f8c96d787f425351c090ffd63f.tar
guix-94af9daa73f600f8c96d787f425351c090ffd63f.tar.gz
services: boot: Reinstate /tmp and /var/run deletion.
For some time /tmp and /var/run were not being deleted because 'delete-file-recursively' was unbound. * gnu/services.scm (compute-boot-script)[%modules, modules, compiled]: New variables. Use them to augment the module search path.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/services.scm b/gnu/services.scm
index 0e1c74bda8..134342101d 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -206,9 +206,20 @@ containing the given entries."
(extend system-derivation)))
(define (compute-boot-script _ mexps)
- (mlet %store-monad ((gexps (sequence %store-monad mexps)))
+ (define %modules
+ '((guix build utils)))
+
+ (mlet* %store-monad ((gexps (sequence %store-monad mexps))
+ (modules (imported-modules %modules))
+ (compiled (compiled-modules %modules)))
(gexp->file "boot"
#~(begin
+ (eval-when (expand load eval)
+ ;; Make sure 'use-modules' below succeeds.
+ (set! %load-path (cons #$modules %load-path))
+ (set! %load-compiled-path
+ (cons #$compiled %load-compiled-path)))
+
(use-modules (guix build utils))
;; Clean out /tmp and /var/run.