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 /gnu/system | |
| parent | 6c441efc5a554bdb6a0139d552dbb38fecbd93ba (diff) | |
| download | gnu-guix-fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35.tar gnu-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 'gnu/system')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 6 | ||||
| -rw-r--r-- | gnu/system/install.scm | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 056b439c5f..ce3653c8b4 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -26,8 +26,10 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) ;; Assuming /dev/sdX is the target hard disk, and "my-root" is ;; the label of the target root file system. - (bootloader (grub-configuration (target "/dev/sda") - (terminal-outputs '(console)))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda") + (terminal-outputs '(console)))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 78f2bf3a13..2e4dd05bb2 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -301,7 +302,9 @@ You have been warned. Thanks for being so brave.\x1b[0m (host-name "gnu") (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda"))) (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. |