diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-08-07 15:07:47 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-08-29 01:05:26 -0400 |
| commit | da4e40948326387d5bcda58783914d5f9ce8b095 (patch) | |
| tree | 5b40bfc74ea3e8715ee9dba5ab6d67dbf87952f5 /gnu/system/install.scm | |
| parent | 2ca982ff41270288913ad6b7d5d9e1cad87b06d9 (diff) | |
Migrate to the new 'targets' field of bootloader-configuration.
The old 'target' field is deprecated; adjust the sources to use the new
'targets' one instead.
* doc/guix-cookbook.texi<target>: Replace by 'targets'.
* gnu/bootloader/grub.scm: Likewise.
* gnu/installer/parted.scm: Likewise.
* gnu/machine/digital-ocean.scm: Likewise.
* gnu/system/examples/asus-c201.tmpl: Likewise
* gnu/system/examples/bare-bones.tmpl: Likewise
* gnu/system/examples/bare-hurd.tmpl: Likewise
* gnu/system/examples/beaglebone-black.tmpl: Likewise
* gnu/system/examples/desktop.tmpl: Likewise
* gnu/system/examples/docker-image.tmpl: Likewise
* gnu/system/examples/lightweight-desktop.tmpl: Likewise
* gnu/system/examples/vm-image.tmpl: Likewise
* gnu/system/examples/yggdrasil.tmpl: Likewise
* gnu/system/hurd.scm: Likewise
* gnu/system/images/hurd.scm: Likewise
* gnu/system/images/novena.scm: Likewise
* gnu/system/images/pine64.scm: Likewise
* gnu/system/images/pinebook-pro.scm: Likewise
* gnu/system/images/rock64.scm: Likewise
* gnu/system/install.scm: Likewise
* gnu/system/vm.scm: Likewise
* gnu/tests.scm: Likewise
* gnu/tests/ganeti.scm: Likewise
* gnu/tests/install.scm: Likewise
* gnu/tests/nfs.scm: Likewise
* gnu/tests/telephony.scm: Likewise
* tests/boot-parameters.scm: Likewise
* tests/system.scm: Likewise
Diffstat (limited to 'gnu/system/install.scm')
| -rw-r--r-- | gnu/system/install.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 87da89e3fb2..7b394184ad2 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm | |||
| @@ -454,7 +454,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m | |||
| 454 | (name-service-switch %mdns-host-lookup-nss) | 454 | (name-service-switch %mdns-host-lookup-nss) |
| 455 | (bootloader (bootloader-configuration | 455 | (bootloader (bootloader-configuration |
| 456 | (bootloader grub-bootloader) | 456 | (bootloader grub-bootloader) |
| 457 | (target "/dev/sda"))) | 457 | (targets '("/dev/sda")))) |
| 458 | (label (string-append "GNU Guix installation " | 458 | (label (string-append "GNU Guix installation " |
| 459 | (package-version guix))) | 459 | (package-version guix))) |
| 460 | 460 | ||
| @@ -530,7 +530,7 @@ operating-system's kernel-arguments (\"console=ttyS0\" or similar)." | |||
| 530 | (bootloader (bootloader-configuration | 530 | (bootloader (bootloader-configuration |
| 531 | (bootloader (bootloader (inherit u-boot-bootloader) | 531 | (bootloader (bootloader (inherit u-boot-bootloader) |
| 532 | (package (make-u-boot-package board triplet)))) | 532 | (package (make-u-boot-package board triplet)))) |
| 533 | (target bootloader-target))))) | 533 | (targets (list bootloader-target)))))) |
| 534 | 534 | ||
| 535 | (define* (embedded-installation-os bootloader bootloader-target tty | 535 | (define* (embedded-installation-os bootloader bootloader-target tty |
| 536 | #:key (extra-modules '())) | 536 | #:key (extra-modules '())) |
| @@ -542,7 +542,7 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." | |||
| 542 | (inherit installation-os) | 542 | (inherit installation-os) |
| 543 | (bootloader (bootloader-configuration | 543 | (bootloader (bootloader-configuration |
| 544 | (bootloader bootloader) | 544 | (bootloader bootloader) |
| 545 | (target bootloader-target))) | 545 | (targets (list bootloader-target)))) |
| 546 | (kernel linux-libre) | 546 | (kernel linux-libre) |
| 547 | (kernel-arguments | 547 | (kernel-arguments |
| 548 | (cons (string-append "console=" tty) | 548 | (cons (string-append "console=" tty) |
