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 | |
| 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')
| -rw-r--r-- | gnu/system/examples/asus-c201.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/bare-bones.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/bare-hurd.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/beaglebone-black.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/desktop.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/docker-image.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/lightweight-desktop.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/yggdrasil.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/hurd.scm | 2 | ||||
| -rw-r--r-- | gnu/system/images/hurd.scm | 2 | ||||
| -rw-r--r-- | gnu/system/images/novena.scm | 2 | ||||
| -rw-r--r-- | gnu/system/images/pine64.scm | 2 | ||||
| -rw-r--r-- | gnu/system/images/pinebook-pro.scm | 2 | ||||
| -rw-r--r-- | gnu/system/images/rock64.scm | 2 | ||||
| -rw-r--r-- | gnu/system/install.scm | 6 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 2 |
17 files changed, 19 insertions, 19 deletions
diff --git a/gnu/system/examples/asus-c201.tmpl b/gnu/system/examples/asus-c201.tmpl index c08f85367fc..6b6aa706fad 100644 --- a/gnu/system/examples/asus-c201.tmpl +++ b/gnu/system/examples/asus-c201.tmpl | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | ;; "my-root" is the label of the target root file system. | 14 | ;; "my-root" is the label of the target root file system. |
| 15 | (bootloader (bootloader-configuration | 15 | (bootloader (bootloader-configuration |
| 16 | (bootloader depthcharge-bootloader) | 16 | (bootloader depthcharge-bootloader) |
| 17 | (target "/dev/mmcblk0p1"))) | 17 | (targets '("/dev/mmcblk0p1")))) |
| 18 | 18 | ||
| 19 | ;; The ASUS C201PA requires a very particular kernel to boot, | 19 | ;; The ASUS C201PA requires a very particular kernel to boot, |
| 20 | ;; as well as the following arguments. | 20 | ;; as well as the following arguments. |
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 1035ab1d602..387e4b12baf 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | ;; root file system. | 15 | ;; root file system. |
| 16 | (bootloader (bootloader-configuration | 16 | (bootloader (bootloader-configuration |
| 17 | (bootloader grub-bootloader) | 17 | (bootloader grub-bootloader) |
| 18 | (target "/dev/sdX"))) | 18 | (targets '("/dev/sdX")))) |
| 19 | (file-systems (cons (file-system | 19 | (file-systems (cons (file-system |
| 20 | (device (file-system-label "my-root")) | 20 | (device (file-system-label "my-root")) |
| 21 | (mount-point "/") | 21 | (mount-point "/") |
diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 135ed23cb6e..f0dd0cf742b 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | (inherit %hurd-default-operating-system) | 32 | (inherit %hurd-default-operating-system) |
| 33 | (bootloader (bootloader-configuration | 33 | (bootloader (bootloader-configuration |
| 34 | (bootloader grub-minimal-bootloader) | 34 | (bootloader grub-minimal-bootloader) |
| 35 | (target "/dev/sdX"))) | 35 | (targets '("/dev/sdX")))) |
| 36 | (file-systems (cons (file-system | 36 | (file-systems (cons (file-system |
| 37 | (device (file-system-label "my-root")) | 37 | (device (file-system-label "my-root")) |
| 38 | (mount-point "/") | 38 | (mount-point "/") |
diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl index def05e807d3..90dab620627 100644 --- a/gnu/system/examples/beaglebone-black.tmpl +++ b/gnu/system/examples/beaglebone-black.tmpl | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | ;; the label of the target root file system. | 14 | ;; the label of the target root file system. |
| 15 | (bootloader (bootloader-configuration | 15 | (bootloader (bootloader-configuration |
| 16 | (bootloader u-boot-beaglebone-black-bootloader) | 16 | (bootloader u-boot-beaglebone-black-bootloader) |
| 17 | (target "/dev/mmcblk1"))) | 17 | (targets '("/dev/mmcblk1")))) |
| 18 | 18 | ||
| 19 | ;; This module is required to mount the SD card. | 19 | ;; This module is required to mount the SD card. |
| 20 | (initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) | 20 | (initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) |
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 716b9feb8de..c928008c925 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | ;; Partition mounted on /boot/efi. | 19 | ;; Partition mounted on /boot/efi. |
| 20 | (bootloader (bootloader-configuration | 20 | (bootloader (bootloader-configuration |
| 21 | (bootloader grub-efi-bootloader) | 21 | (bootloader grub-efi-bootloader) |
| 22 | (target "/boot/efi") | 22 | (targets '("/boot/efi")) |
| 23 | (keyboard-layout keyboard-layout))) | 23 | (keyboard-layout keyboard-layout))) |
| 24 | 24 | ||
| 25 | ;; Specify a mapped device for the encrypted root partition. | 25 | ;; Specify a mapped device for the encrypted root partition. |
diff --git a/gnu/system/examples/docker-image.tmpl b/gnu/system/examples/docker-image.tmpl index ca633cc838c..bdc6afa6f0c 100644 --- a/gnu/system/examples/docker-image.tmpl +++ b/gnu/system/examples/docker-image.tmpl | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | ;; This will be ignored. | 35 | ;; This will be ignored. |
| 36 | (bootloader (bootloader-configuration | 36 | (bootloader (bootloader-configuration |
| 37 | (bootloader grub-bootloader) | 37 | (bootloader grub-bootloader) |
| 38 | (target "does-not-matter"))) | 38 | (targets '("does-not-matter")))) |
| 39 | ;; This will be ignored, too. | 39 | ;; This will be ignored, too. |
| 40 | (file-systems (list (file-system | 40 | (file-systems (list (file-system |
| 41 | (device "does-not-matter") | 41 | (device "does-not-matter") |
diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index d5a63dc457f..d4330ecc8ea 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | ;; Partition mounted on /boot/efi. | 16 | ;; Partition mounted on /boot/efi. |
| 17 | (bootloader (bootloader-configuration | 17 | (bootloader (bootloader-configuration |
| 18 | (bootloader grub-efi-bootloader) | 18 | (bootloader grub-efi-bootloader) |
| 19 | (target "/boot/efi"))) | 19 | (targets '("/boot/efi")))) |
| 20 | 20 | ||
| 21 | ;; Assume the target root file system is labelled "my-root", | 21 | ;; Assume the target root file system is labelled "my-root", |
| 22 | ;; and the EFI System Partition has UUID 1234-ABCD. | 22 | ;; and the EFI System Partition has UUID 1234-ABCD. |
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 697019e877d..a59d91587ba 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl | |||
| @@ -51,7 +51,7 @@ accounts.\x1b[0m | |||
| 51 | ;; Adjust as needed. | 51 | ;; Adjust as needed. |
| 52 | (bootloader (bootloader-configuration | 52 | (bootloader (bootloader-configuration |
| 53 | (bootloader grub-bootloader) | 53 | (bootloader grub-bootloader) |
| 54 | (target "/dev/vda") | 54 | (targets '("/dev/vda")) |
| 55 | (terminal-outputs '(console)))) | 55 | (terminal-outputs '(console)))) |
| 56 | (file-systems (cons (file-system | 56 | (file-systems (cons (file-system |
| 57 | (mount-point "/") | 57 | (mount-point "/") |
diff --git a/gnu/system/examples/yggdrasil.tmpl b/gnu/system/examples/yggdrasil.tmpl index be80bf4de9e..4d34f49b54f 100644 --- a/gnu/system/examples/yggdrasil.tmpl +++ b/gnu/system/examples/yggdrasil.tmpl | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | ;; root file system. | 15 | ;; root file system. |
| 16 | (bootloader (bootloader-configuration | 16 | (bootloader (bootloader-configuration |
| 17 | (bootloader grub-bootloader) | 17 | (bootloader grub-bootloader) |
| 18 | (target "/dev/sdX"))) | 18 | (targets '("/dev/sdX")))) |
| 19 | (file-systems (cons (file-system | 19 | (file-systems (cons (file-system |
| 20 | (device (file-system-label "my-root")) | 20 | (device (file-system-label "my-root")) |
| 21 | (mount-point "/") | 21 | (mount-point "/") |
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 95e511196a0..e976494d74f 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm | |||
| @@ -110,7 +110,7 @@ | |||
| 110 | (hurd hurd) | 110 | (hurd hurd) |
| 111 | (bootloader (bootloader-configuration | 111 | (bootloader (bootloader-configuration |
| 112 | (bootloader grub-minimal-bootloader) | 112 | (bootloader grub-minimal-bootloader) |
| 113 | (target "/dev/vda"))) | 113 | (targets '("/dev/vda")))) |
| 114 | (initrd #f) | 114 | (initrd #f) |
| 115 | (initrd-modules (lambda _ '())) | 115 | (initrd-modules (lambda _ '())) |
| 116 | (firmware '()) | 116 | (firmware '()) |
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index eac5b7f7e6d..fc2dbe3209d 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | (inherit %hurd-default-operating-system) | 42 | (inherit %hurd-default-operating-system) |
| 43 | (bootloader (bootloader-configuration | 43 | (bootloader (bootloader-configuration |
| 44 | (bootloader grub-minimal-bootloader) | 44 | (bootloader grub-minimal-bootloader) |
| 45 | (target "/dev/sdX"))) | 45 | (targets '("/dev/sdX")))) |
| 46 | (file-systems (cons (file-system | 46 | (file-systems (cons (file-system |
| 47 | (device (file-system-label "my-root")) | 47 | (device (file-system-label "my-root")) |
| 48 | (mount-point "/") | 48 | (mount-point "/") |
diff --git a/gnu/system/images/novena.scm b/gnu/system/images/novena.scm index 1cd724ff880..63227af5099 100644 --- a/gnu/system/images/novena.scm +++ b/gnu/system/images/novena.scm | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | (locale "en_US.utf8") | 39 | (locale "en_US.utf8") |
| 40 | (bootloader (bootloader-configuration | 40 | (bootloader (bootloader-configuration |
| 41 | (bootloader u-boot-novena-bootloader) | 41 | (bootloader u-boot-novena-bootloader) |
| 42 | (target "/dev/vda"))) | 42 | (targets '("/dev/vda")))) |
| 43 | (initrd-modules '("sdhci-esdhc-imx" "ahci_imx" "i2c-dev")) | 43 | (initrd-modules '("sdhci-esdhc-imx" "ahci_imx" "i2c-dev")) |
| 44 | ;(kernel linux-libre-arm-generic) | 44 | ;(kernel linux-libre-arm-generic) |
| 45 | (kernel-arguments '("console=ttymxc1,115200")) | 45 | (kernel-arguments '("console=ttymxc1,115200")) |
diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index 613acd5cfdf..808c71295f0 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | (locale "en_US.utf8") | 38 | (locale "en_US.utf8") |
| 39 | (bootloader (bootloader-configuration | 39 | (bootloader (bootloader-configuration |
| 40 | (bootloader u-boot-pine64-lts-bootloader) | 40 | (bootloader u-boot-pine64-lts-bootloader) |
| 41 | (target "/dev/vda"))) | 41 | (targets '("/dev/vda")))) |
| 42 | (initrd-modules '()) | 42 | (initrd-modules '()) |
| 43 | (kernel linux-libre-arm64-generic) | 43 | (kernel linux-libre-arm64-generic) |
| 44 | (file-systems (cons (file-system | 44 | (file-systems (cons (file-system |
diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pinebook-pro.scm index ca96621cc4b..b6b844cef6a 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | (locale "en_US.utf8") | 38 | (locale "en_US.utf8") |
| 39 | (bootloader (bootloader-configuration | 39 | (bootloader (bootloader-configuration |
| 40 | (bootloader u-boot-pinebook-pro-rk3399-bootloader) | 40 | (bootloader u-boot-pinebook-pro-rk3399-bootloader) |
| 41 | (target "/dev/vda"))) | 41 | (targets '("/dev/vda")))) |
| 42 | (initrd-modules '()) | 42 | (initrd-modules '()) |
| 43 | (kernel linux-libre-arm64-generic) | 43 | (kernel linux-libre-arm64-generic) |
| 44 | (file-systems (cons (file-system | 44 | (file-systems (cons (file-system |
diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm index 3f193e8528c..68d3742adc9 100644 --- a/gnu/system/images/rock64.scm +++ b/gnu/system/images/rock64.scm | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | (locale "en_US.utf8") | 39 | (locale "en_US.utf8") |
| 40 | (bootloader (bootloader-configuration | 40 | (bootloader (bootloader-configuration |
| 41 | (bootloader u-boot-rock64-rk3328-bootloader) | 41 | (bootloader u-boot-rock64-rk3328-bootloader) |
| 42 | (target "/dev/sda"))) | 42 | (targets '("/dev/sda")))) |
| 43 | (initrd-modules '()) | 43 | (initrd-modules '()) |
| 44 | (kernel linux-libre-arm64-generic) | 44 | (kernel linux-libre-arm64-generic) |
| 45 | (file-systems (cons (file-system | 45 | (file-systems (cons (file-system |
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) |
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 02418108977..1e2d8b47c2c 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm | |||
| @@ -630,7 +630,7 @@ environment with the store shared with the host. MAPPINGS is a list of | |||
| 630 | (bootloader (bootloader-configuration | 630 | (bootloader (bootloader-configuration |
| 631 | (inherit (operating-system-bootloader os)) | 631 | (inherit (operating-system-bootloader os)) |
| 632 | (bootloader grub-bootloader) | 632 | (bootloader grub-bootloader) |
| 633 | (target "/dev/vda"))) | 633 | (targets '("/dev/vda")))) |
| 634 | 634 | ||
| 635 | (initrd (lambda (file-systems . rest) | 635 | (initrd (lambda (file-systems . rest) |
| 636 | (apply (operating-system-initrd os) | 636 | (apply (operating-system-initrd os) |
