summaryrefslogtreecommitdiff
path: root/gnu/tests.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2017-09-03 01:19:38 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2017-12-06 15:02:24 +0100
commitfdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35 (patch)
treea58dc6e21d8bf7458efb0c48a90947f61eab844a /gnu/tests.scm
parent6c441efc5a554bdb6a0139d552dbb38fecbd93ba (diff)
gnu, doc, tests: Use ‘bootloader-configuration’ everywhere.
* doc/guix.texi (Proceeding with the Installation): Replace the old-style ‘grub-configuration’ with the newer ‘bootloader-configuration’ syntax. * gnu/system/examples/vm-image.tmpl: Likewise. * gnu/system/install.scm (installation-os): Likewise. * gnu/tests.scm (%simple-os): Likewise. * gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda, %separate-home-os) (%separate-store-os, %raid-root-os, %encrypted-root-os, %btrfs-root-os): Likewise. * gnu/tests/nfs.scm (%base-os): Likewise. * tests/guix-system.scm (OS_BASE, make_user_config): Likewise. * tests/system.scm (%os, %os-with-mapped-device): Likewise.
Diffstat (limited to 'gnu/tests.scm')
-rw-r--r--gnu/tests.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/tests.scm b/gnu/tests.scm
index 97b9cc5107c..0caa922fdfb 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -1,6 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> 3;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
4;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
4;;; 5;;;
5;;; This file is part of GNU Guix. 6;;; This file is part of GNU Guix.
6;;; 7;;;
@@ -21,6 +22,7 @@
21 #:use-module (guix gexp) 22 #:use-module (guix gexp)
22 #:use-module (guix utils) 23 #:use-module (guix utils)
23 #:use-module (guix records) 24 #:use-module (guix records)
25 #:use-module (gnu bootloader)
24 #:use-module (gnu bootloader grub) 26 #:use-module (gnu bootloader grub)
25 #:use-module (gnu system) 27 #:use-module (gnu system)
26 #:use-module (gnu system file-systems) 28 #:use-module (gnu system file-systems)
@@ -206,7 +208,9 @@ the system under test."
206 (timezone "Europe/Berlin") 208 (timezone "Europe/Berlin")
207 (locale "en_US.UTF-8") 209 (locale "en_US.UTF-8")
208 210
209 (bootloader (grub-configuration (target "/dev/sdX"))) 211 (bootloader (bootloader-configuration
212 (bootloader grub-bootloader)
213 (target "/dev/sdX")))
210 (file-systems (cons (file-system 214 (file-systems (cons (file-system
211 (device "my-root") 215 (device "my-root")
212 (title 'label) 216 (title 'label)