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

system: Add 'operating-system-with-gc-roots'. 

* gnu/tests/install.scm (operating-system-with-gc-roots): Move to...
* gnu/system.scm (operating-system-with-gc-roots): ... here.  New
procedure.
This commit is contained in:
Ludovic Courtès 2019-05-10 22:29:10 +02:00
parent 3f9bed04f0
commit 9fcfe30d28
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/system.scm
View File

@ -109,6 +109,7 @@
operating-system-boot-script operating-system-boot-script
system-linux-image-file-name system-linux-image-file-name
operating-system-with-gc-roots
boot-parameters boot-parameters
boot-parameters? boot-parameters?
@ -519,6 +520,17 @@ bookkeeping."
(append (operating-system-user-services os) (append (operating-system-user-services os)
(operating-system-essential-services os)))) (operating-system-essential-services os))))
(define (operating-system-with-gc-roots os roots)
"Return a variant of OS where ROOTS are registered as GC roots."
(operating-system
(inherit os)
;; We use this procedure for the installation OS, which already defines GC
;; roots. Add ROOTS to those.
(services (cons (simple-service 'extra-root
gc-root-service-type roots)
(operating-system-user-services os)))))
;;; ;;;
;;; /etc. ;;; /etc.

11
gnu/tests/install.scm
View File

@ -123,17 +123,6 @@
(inherit config) (inherit config)
(guix (current-guix)))))))) (guix (current-guix))))))))
(define (operating-system-with-gc-roots os roots)
"Return a variant of OS where ROOTS are registered as GC roots."
(operating-system
(inherit os)
;; We use this procedure for the installation OS, which already defines GC
;; roots. Add ROOTS to those.
(services (cons (simple-service 'extra-root
gc-root-service-type roots)
(operating-system-user-services os)))))
(define MiB (expt 2 20)) (define MiB (expt 2 20))