04/08: services: boot: Reinstate /tmp and /var/run deletion.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 94af9daa73f600f8c96d787f425351c090ffd63f
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 4 22:42:09 2016 +0100

    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.
---
 gnu/services.scm |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/services.scm b/gnu/services.scm
index 0e1c74b..1343421 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 <address@hidden>
+;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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.