summaryrefslogtreecommitdiff
path: root/gnu/tests/install.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-09-27 21:14:27 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-09-27 21:14:27 +0200
commit9f1d112d1282216f16b2f673c8213d2839e39b7a (patch)
tree890d036d75ae0d38ebff39a4be000959e71409ec /gnu/tests/install.scm
parent859620e51db0b7ffb666cd47146eca4fd4d6ba63 (diff)
parentcb1e0cfc2f32e6811da588231497d896491ceabb (diff)
downloadguix-patches-9f1d112d1282216f16b2f673c8213d2839e39b7a.tar
guix-patches-9f1d112d1282216f16b2f673c8213d2839e39b7a.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/tests/install.scm')
-rw-r--r--gnu/tests/install.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 49743860e5..d0cc08f431 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -127,7 +127,11 @@
"Return a variant of OS where ROOTS are registered as GC roots."
(operating-system
(inherit os)
- (services (cons (service gc-root-service-type roots)
+
+ ;; 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)))))