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

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.
This commit is contained in:
Ludovic Courtès 2016-01-04 22:42:09 +01:00
parent db5a94445f
commit 94af9daa73
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/services.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -206,9 +206,20 @@ containing the given entries."
(extend system-derivation))) (extend system-derivation)))
(define (compute-boot-script _ mexps) (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" (gexp->file "boot"
#~(begin #~(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)) (use-modules (guix build utils))
;; Clean out /tmp and /var/run. ;; Clean out /tmp and /var/run.