diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-09-03 01:19:38 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-12-06 15:02:24 +0100 |
| commit | fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35 (patch) | |
| tree | a58dc6e21d8bf7458efb0c48a90947f61eab844a /tests | |
| parent | 6c441efc5a554bdb6a0139d552dbb38fecbd93ba (diff) | |
| download | guix-fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35.tar guix-fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35.tar.gz | |
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 'tests')
| -rw-r--r-- | tests/guix-system.sh | 9 | ||||
| -rw-r--r-- | tests/system.scm | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 213864833a..ed8563c8aa 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> # # This file is part of GNU Guix. # @@ -134,7 +135,9 @@ OS_BASE=' (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title (string->symbol "label")) @@ -205,7 +208,9 @@ make_user_config () (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title 'label) diff --git a/tests/system.scm b/tests/system.scm index a661544a5f..6a7f45c59c 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,9 @@ (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons %root-fs %base-file-systems)) (users %base-user-accounts))) @@ -51,7 +54,9 @@ (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (mapped-devices (list %luks-device)) (file-systems (cons (file-system (inherit %root-fs) |