summaryrefslogtreecommitdiff
path: root/gnu/tests/nfs.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/nfs.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/nfs.scm')
-rw-r--r--gnu/tests/nfs.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm
index 889f578d018..d58cf7aefd3 100644
--- a/gnu/tests/nfs.scm
+++ b/gnu/tests/nfs.scm
@@ -2,6 +2,7 @@
2;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2016 John Darrington <jmd@gnu.org> 3;;; Copyright © 2016 John Darrington <jmd@gnu.org>
4;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> 4;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
5;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; 6;;;
6;;; This file is part of GNU Guix. 7;;; This file is part of GNU Guix.
7;;; 8;;;
@@ -20,6 +21,7 @@
20 21
21(define-module (gnu tests nfs) 22(define-module (gnu tests nfs)
22 #:use-module (gnu tests) 23 #:use-module (gnu tests)
24 #:use-module (gnu bootloader)
23 #:use-module (gnu bootloader grub) 25 #:use-module (gnu bootloader grub)
24 #:use-module (gnu system) 26 #:use-module (gnu system)
25 #:use-module (gnu system file-systems) 27 #:use-module (gnu system file-systems)
@@ -41,7 +43,9 @@
41 (timezone "Europe/Berlin") 43 (timezone "Europe/Berlin")
42 (locale "en_US.UTF-8") 44 (locale "en_US.UTF-8")
43 45
44 (bootloader (grub-configuration (target "/dev/sdX"))) 46 (bootloader (bootloader-configuration
47 (bootloader grub-bootloader)
48 (target "/dev/sdX")))
45 (file-systems %base-file-systems) 49 (file-systems %base-file-systems)
46 (users %base-user-accounts) 50 (users %base-user-accounts)
47 (packages (cons* 51 (packages (cons*