From fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Sep 2017 01:19:38 +0200 Subject: gnu, doc, tests: Use ‘bootloader-configuration’ everywhere. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. --- gnu/system/examples/vm-image.tmpl | 6 ++++-- gnu/system/install.scm | 5 ++++- gnu/tests.scm | 6 +++++- gnu/tests/install.scm | 29 ++++++++++++++++++++++------- gnu/tests/nfs.scm | 6 +++++- 5 files changed, 40 insertions(+), 12 deletions(-) (limited to 'gnu') 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 ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -301,7 +302,9 @@ (define installation-os (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. diff --git a/gnu/tests.scm b/gnu/tests.scm index 97b9cc5107..0caa922fdf 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu tests) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix records) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -206,7 +208,9 @@ (define %simple-os (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 0e97de0a87..3ac4a579da 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,9 @@ (define-os-with-source (%minimal-os %minimal-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -343,7 +346,9 @@ (define-os-with-source (%minimal-os-on-vda %minimal-os-on-vda-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -418,7 +423,9 @@ (define-os-with-source (%separate-home-os %separate-home-os-source) (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "my-root") @@ -476,7 +483,9 @@ (define-os-with-source (%separate-store-os %separate-store-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "root-fs") @@ -552,7 +561,9 @@ (define-os-with-source (%raid-root-os %raid-root-os-source) (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (initrd (lambda (file-systems . rest) ;; Add a kernel module for RAID-0 (aka. "stripe"). @@ -635,7 +646,9 @@ (define-os-with-source (%encrypted-root-os %encrypted-root-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt ;; detection logic in 'enter-luks-passphrase'. @@ -762,7 +775,9 @@ (define-os-with-source (%btrfs-root-os %btrfs-root-os-source) (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 889f578d01..d58cf7aefd 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu tests nfs) #:use-module (gnu tests) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -41,7 +43,9 @@ (define %base-os (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems %base-file-systems) (users %base-user-accounts) (packages (cons* -- cgit v1.2.3