[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: system: Add 'operating-system-with-gc-roots'.
From: |
guix-commits |
Subject: |
06/08: system: Add 'operating-system-with-gc-roots'. |
Date: |
Wed, 15 May 2019 10:36:31 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9fcfe30d283cd7d36c6e292ea1235eb24307b003
Author: Ludovic Courtès <address@hidden>
Date: Fri May 10 22:29:10 2019 +0200
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.
---
gnu/system.scm | 12 ++++++++++++
gnu/tests/install.scm | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 2c4ca55..01be124 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -109,6 +109,7 @@
operating-system-boot-script
system-linux-image-file-name
+ operating-system-with-gc-roots
boot-parameters
boot-parameters?
@@ -519,6 +520,17 @@ bookkeeping."
(append (operating-system-user-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.
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 430a102..7b5ee18 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -123,17 +123,6 @@
(inherit config)
(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))
- branch master updated (79bfa42 -> 247649d), guix-commits, 2019/05/15
- 01/08: installer: Rename 'auto-partition' to 'auto-partition!'., guix-commits, 2019/05/15
- 02/08: doc: Mention ModemManager., guix-commits, 2019/05/15
- 04/08: linux-container: Do not add %CONTAINER-FILE-SYSTEMS to Docker image OSes., guix-commits, 2019/05/15
- 05/08: linux-container: Compute essential services for THIS-OPERATING-SYSTEM., guix-commits, 2019/05/15
- 08/08: vm: 'system-docker-image' provides an entry point., guix-commits, 2019/05/15
- 06/08: system: Add 'operating-system-with-gc-roots'.,
guix-commits <=
- 07/08: docker: 'build-docker-image' accepts an optional #:entry-point., guix-commits, 2019/05/15
- 03/08: nls: Update 'zh_CN' translation., guix-commits, 2019/05/16