diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 17:37:20 +0100 |
| commit | 8c72ed923d77ee55989965bb02628043799b9548 (patch) | |
| tree | 802e6eb910719a98fa09bf7c2bd884097f649adc /gnu/tests/install.scm | |
| parent | 189be331acfda1c242a9c85fca8d2a0356742f48 (diff) | |
| parent | aac6cbbfede0bbfafdbbeeb460f00a244333895d (diff) | |
| download | guix-8c72ed923d77ee55989965bb02628043799b9548.tar guix-8c72ed923d77ee55989965bb02628043799b9548.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/tests/install.scm')
| -rw-r--r-- | gnu/tests/install.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 3ac4a579da..e3bb1b46af 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -565,11 +565,10 @@ where /gnu lives on a separate partition.") (bootloader grub-bootloader) (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) - (initrd (lambda (file-systems . rest) - ;; Add a kernel module for RAID-0 (aka. "stripe"). - (apply base-initrd file-systems - #:extra-modules '("raid0") - rest))) + + ;; Add a kernel module for RAID-0 (aka. "stripe"). + (initrd-modules (cons "raid0" %base-initrd-modules)) + (mapped-devices (list (mapped-device (source (list "/dev/vda2" "/dev/vda3")) (target "/dev/md0") |