summary refs log tree commit diff
path: root/gnu/tests/install.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/tests/install.scm')
-rw-r--r--gnu/tests/install.scm26
1 files changed, 8 insertions, 18 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index e3bb1b46af..4764ffffde 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -66,8 +66,7 @@
                  (target "/dev/vdb")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
@@ -105,8 +104,7 @@
                  (target "/dev/vdb")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
@@ -351,8 +349,7 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.")
                  (target "/dev/vda")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
@@ -428,13 +425,11 @@ reboot\n")
                  (target "/dev/vdb")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons* (file-system
-                           (device "my-root")
-                           (title 'label)
+                           (device (file-system-label "my-root"))
                            (mount-point "/")
                            (type "ext4"))
                          (file-system
                            (device "none")
-                           (title 'device)
                            (type "tmpfs")
                            (mount-point "/home")
                            (type "tmpfs"))
@@ -488,13 +483,11 @@ partition.  In particular, home directories must be correctly created (see
                  (target "/dev/vdb")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons* (file-system
-                           (device "root-fs")
-                           (title 'label)
+                           (device (file-system-label "root-fs"))
                            (mount-point "/")
                            (type "ext4"))
                          (file-system
-                           (device "store-fs")
-                           (title 'label)
+                           (device (file-system-label "store-fs"))
                            (mount-point "/gnu")
                            (type "ext4"))
                          %base-file-systems))
@@ -574,8 +567,7 @@ where /gnu lives on a separate partition.")
                            (target "/dev/md0")
                            (type raid-device-mapping))))
     (file-systems (cons (file-system
-                          (device "root-fs")
-                          (title 'label)
+                          (device (file-system-label "root-fs"))
                           (mount-point "/")
                           (type "ext4")
                           (dependencies mapped-devices))
@@ -658,7 +650,6 @@ by 'mdadm'.")
                            (type luks-device-mapping))))
     (file-systems (cons (file-system
                           (device "/dev/mapper/the-root-device")
-                          (title 'device)
                           (mount-point "/")
                           (type "ext4"))
                         %base-file-systems))
@@ -779,8 +770,7 @@ build (current-guix) and then store a couple of full system images.")
                  (target "/dev/vdb")))
     (kernel-arguments '("console=ttyS0"))
     (file-systems (cons (file-system
-                          (device "my-root")
-                          (title 'label)
+                          (device (file-system-label "my-root"))
                           (mount-point "/")
                           (type "btrfs"))
                         %base-file-systems))