summary refs log tree commit diff
path: root/gnu/tests/install.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-26 10:43:10 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-26 10:43:10 +0200
commit945a8fc240dbc48e3e4e212ef527eadc70231d39 (patch)
tree5df28acc38cbab2ab7160d0ae6ec1ba226043ff2 /gnu/tests/install.scm
parent8384499c04978dc8e16f2beb9ee940293c7800c5 (diff)
downloadguix-945a8fc240dbc48e3e4e212ef527eadc70231d39.tar.gz
tests: install: Switch to modifying the gc-root-service-type.
Fixes <https://bugs.gnu.org/28600>.
Fixes a regression introduced in
4e854b1814a9216ae7cc90aef4d82fd989a519c3.
Reported by Christopher Baines <mail@cbaines.net>.

* gnu/tests/install.scm (operating-system-with-gc-roots): Use
'simple-service' to extend GC-ROOT-SERVICE-TYPE instead of instantiating
it.
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)))))