me
/
guix
Archived
1
0
Fork 0
Code

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
Maxim Cournoyer 2021-08-07 15:07:47 -04:00
parent 2ca982ff41
commit da4e409483
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
28 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix-cookbook.texi
View File

@ -1718,7 +1718,7 @@ operating-system dedicated to the @b{Pine A64 LTS} board.
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pine64-lts-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system

5
gnu/bootloader/grub.scm
View File

@ -647,11 +647,12 @@ below the directory TARGET for the system whose root is mounted at MOUNT-POINT.
MOUNT-POINT is the last argument in 'guix system init /etc/config.scm mnt/point'
or '/' for other 'guix system' commands.
TARGET is the target argument given to the bootloader-configuration in
Where TARGET comes from the targets argument given to the
bootloader-configuration in:
(operating-system
(bootloader (bootloader-configuration
(target \"/boot\")
(targets '(\"/boot\"))
…))
…)

4
gnu/installer/parted.scm
View File

@ -1356,9 +1356,9 @@ from (gnu system mapped-devices) and return it."
`((bootloader-configuration
,@(if (efi-installation?)
`((bootloader grub-efi-bootloader)
(target ,(default-esp-mount-point)))
(targets (list ,(default-esp-mount-point))))
`((bootloader grub-bootloader)
(target ,root-partition-disk)))
(targets (list ,root-partition-disk))))
;; XXX: Assume we defined the 'keyboard-layout' field of
;; <operating-system> right above.

2
gnu/machine/digital-ocean.scm
View File

@ -235,7 +235,7 @@ cat > /etc/bootstrap-config.scm << EOF
(timezone \"Etc/UTC\")
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target \"/dev/vda\")
(targets '(\"/dev/vda\"))
(terminal-outputs '(console))))
(file-systems (cons (file-system
(mount-point \"/\")

2
gnu/system/examples/asus-c201.tmpl
View File

@ -14,7 +14,7 @@
;; "my-root" is the label of the target root file system.
(bootloader (bootloader-configuration
(bootloader depthcharge-bootloader)
(target "/dev/mmcblk0p1")))
(targets '("/dev/mmcblk0p1"))))
;; The ASUS C201PA requires a very particular kernel to boot,
;; as well as the following arguments.

2
gnu/system/examples/bare-bones.tmpl
View File

@ -15,7 +15,7 @@
;; root file system.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
gnu/system/examples/bare-hurd.tmpl
View File

@ -32,7 +32,7 @@
(inherit %hurd-default-operating-system)
(bootloader (bootloader-configuration
(bootloader grub-minimal-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
gnu/system/examples/beaglebone-black.tmpl
View File

@ -14,7 +14,7 @@
;; the label of the target root file system.
(bootloader (bootloader-configuration
(bootloader u-boot-beaglebone-black-bootloader)
(target "/dev/mmcblk1")))
(targets '("/dev/mmcblk1"))))
;; This module is required to mount the SD card.
(initrd-modules (cons "omap_hsmmc" %base-initrd-modules))

2
gnu/system/examples/desktop.tmpl
View File

@ -19,7 +19,7 @@
;; Partition mounted on /boot/efi.
(bootloader (bootloader-configuration
(bootloader grub-efi-bootloader)
(target "/boot/efi")
(targets '("/boot/efi"))
(keyboard-layout keyboard-layout)))
;; Specify a mapped device for the encrypted root partition.

2
gnu/system/examples/docker-image.tmpl
View File

@ -35,7 +35,7 @@
;; This will be ignored.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "does-not-matter")))
(targets '("does-not-matter"))))
;; This will be ignored, too.
(file-systems (list (file-system
(device "does-not-matter")

2
gnu/system/examples/lightweight-desktop.tmpl
View File

@ -16,7 +16,7 @@
;; Partition mounted on /boot/efi.
(bootloader (bootloader-configuration
(bootloader grub-efi-bootloader)
(target "/boot/efi")))
(targets '("/boot/efi"))))
;; Assume the target root file system is labelled "my-root",
;; and the EFI System Partition has UUID 1234-ABCD.

2
gnu/system/examples/vm-image.tmpl
View File

@ -51,7 +51,7 @@ accounts.\x1b[0m
;; Adjust as needed.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/vda")
(targets '("/dev/vda"))
(terminal-outputs '(console))))
(file-systems (cons (file-system
(mount-point "/")

2
gnu/system/examples/yggdrasil.tmpl
View File

@ -15,7 +15,7 @@
;; root file system.
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
gnu/system/hurd.scm
View File

@ -110,7 +110,7 @@
(hurd hurd)
(bootloader (bootloader-configuration
(bootloader grub-minimal-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd #f)
(initrd-modules (lambda _ '()))
(firmware '())

2
gnu/system/images/hurd.scm
View File

@ -42,7 +42,7 @@
(inherit %hurd-default-operating-system)
(bootloader (bootloader-configuration
(bootloader grub-minimal-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
gnu/system/images/novena.scm
View File

@ -39,7 +39,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-novena-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd-modules '("sdhci-esdhc-imx" "ahci_imx" "i2c-dev"))
;(kernel linux-libre-arm-generic)
(kernel-arguments '("console=ttymxc1,115200"))

2
gnu/system/images/pine64.scm
View File

@ -38,7 +38,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pine64-lts-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system

2
gnu/system/images/pinebook-pro.scm
View File

@ -38,7 +38,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-pinebook-pro-rk3399-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system

2
gnu/system/images/rock64.scm
View File

@ -39,7 +39,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader u-boot-rock64-rk3328-bootloader)
(target "/dev/sda")))
(targets '("/dev/sda"))))
(initrd-modules '())
(kernel linux-libre-arm64-generic)
(file-systems (cons (file-system

6
gnu/system/install.scm
View File

@ -454,7 +454,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
(name-service-switch %mdns-host-lookup-nss)
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sda")))
(targets '("/dev/sda"))))
(label (string-append "GNU Guix installation "
(package-version guix)))
@ -530,7 +530,7 @@ operating-system's kernel-arguments (\"console=ttyS0\" or similar)."
(bootloader (bootloader-configuration
(bootloader (bootloader (inherit u-boot-bootloader)
(package (make-u-boot-package board triplet))))
(target bootloader-target)))))
(targets (list bootloader-target))))))
(define* (embedded-installation-os bootloader bootloader-target tty
#:key (extra-modules '()))
@ -542,7 +542,7 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
(inherit installation-os)
(bootloader (bootloader-configuration
(bootloader bootloader)
(target bootloader-target)))
(targets (list bootloader-target))))
(kernel linux-libre)
(kernel-arguments
(cons (string-append "console=" tty)

2
gnu/system/vm.scm
View File

@ -630,7 +630,7 @@ environment with the store shared with the host. MAPPINGS is a list of
(bootloader (bootloader-configuration
(inherit (operating-system-bootloader os))
(bootloader grub-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(initrd (lambda (file-systems . rest)
(apply (operating-system-initrd os)

2
gnu/tests.scm
View File

@ -222,7 +222,7 @@ the system under test."
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
gnu/tests/ganeti.scm
View File

@ -38,7 +38,7 @@
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/vda")))
(targets '("/dev/vda"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

4
gnu/tests/install.scm
View File

@ -494,7 +494,7 @@ reboot\n")
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/vdb")))
(targets '("/dev/vdb"))))
(kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system
(device (file-system-label "my-root"))
@ -709,7 +709,7 @@ by 'mdadm'.")
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/vdb")))
(targets '("/dev/vdb"))))
;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt
;; detection logic in 'enter-luks-passphrase'.

2
gnu/tests/nfs.scm
View File

@ -50,7 +50,7 @@
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems %base-file-systems)
(users %base-user-accounts)
(packages (cons*

2
gnu/tests/telephony.scm
View File

@ -74,7 +74,7 @@
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons (file-system
(device (file-system-label "my-root"))
(mount-point "/")

2
tests/boot-parameters.scm
View File

@ -81,7 +81,7 @@
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sda")))
(targets '("/dev/sda"))))
(file-systems (cons* (file-system
(device %default-root-device)
(mount-point %root-path)

4
tests/system.scm
View File

@ -39,7 +39,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(file-systems (cons %root-fs %base-file-systems))
(users %base-user-accounts)))
@ -56,7 +56,7 @@
(locale "en_US.utf8")
(bootloader (bootloader-configuration
(bootloader grub-bootloader)
(target "/dev/sdX")))
(targets '("/dev/sdX"))))
(mapped-devices (list %luks-device))
(file-systems (cons (file-system
(inherit %root-fs)