diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index d87e494348..f698532a94 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1191,17 +1191,13 @@ (define %minimal-vm-syslog-config (define %virtual-build-machine-operating-system (operating-system (host-name "build-machine") - (locale "en_US.utf8") (locale-definitions ;; Save space by providing only one locale. (list (locale-definition (name "en_US.utf8") (source "en_US") (charset "UTF-8")))) - - (bootloader (bootloader-configuration ;unused - (bootloader grub-minimal-bootloader) - (targets '("/dev/null")))) + ;; no bootloader (file-systems (cons (file-system ;unused (mount-point "/") (device "none") @@ -1624,9 +1620,8 @@ (define %hurd-vm-operating-system (host-name "childhurd") (timezone "Europe/Amsterdam") (bootloader (bootloader-configuration - (bootloader grub-minimal-bootloader) - (targets '("/dev/vda")) - (timeout 0))) + (bootloader grub-minimal-bootloader) + (timeout 0))) (packages (cons* gdb-minimal (operating-system-packages %hurd-default-operating-system))) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 6d6a20cf57..3669fd3c9a 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -119,9 +119,7 @@ (define %hurd-default-operating-system (kernel %hurd-default-operating-system-kernel) (kernel-arguments '()) (hurd hurd) - (bootloader (bootloader-configuration - (bootloader grub-minimal-bootloader) - (targets '("/dev/vda")))) + (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader))) (initrd #f) (initrd-modules '()) (firmware '()) diff --git a/gnu/system/images/wsl2.scm b/gnu/system/images/wsl2.scm index b772d7b635..6bab220379 100644 --- a/gnu/system/images/wsl2.scm +++ b/gnu/system/images/wsl2.scm @@ -127,16 +127,6 @@ (define dummy-package (description #f) (license (fsdg-compatible "dummy")))) -(define dummy-bootloader - (bootloader - (name 'dummy-bootloader) - (package dummy-package) - (configuration-file "/dev/null") - (configuration-file-generator - (lambda (. _rest) - (plain-file "dummy-bootloader" ""))) - (installer #~(const #t)))) - (define dummy-kernel dummy-package) (define (dummy-initrd . _rest) @@ -146,9 +136,7 @@ (define-public wsl-os (operating-system (host-name "gnu") (timezone "Etc/UTC") - (bootloader - (bootloader-configuration - (bootloader dummy-bootloader))) + ;; no bootloader (kernel dummy-kernel) (initrd dummy-initrd) (initrd-modules '()) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a2743453e7..be12ae6b6c 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -172,17 +172,6 @@ (define virtual-file-systems (operating-system (inherit os) - ;; XXX: Until we run QEMU with UEFI support (with the OVMF firmware), - ;; force the traditional i386/BIOS method. - ;; See . - (bootloader (bootloader-configuration - (inherit (operating-system-bootloader os)) - (bootloader - (if (target-riscv64? (or target system)) - u-boot-qemu-riscv64-bootloader - grub-bootloader)) - (targets '("/dev/vda")))) - (initrd (lambda (file-systems . rest) (apply (operating-system-initrd os) file-systems diff --git a/gnu/tests.scm b/gnu/tests.scm index 5ff9db82fc..f46ccf5174 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -237,7 +237,9 @@ (define %simple-os (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device"/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index 29eb354044..789879b26f 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -40,7 +40,9 @@ (define %ganeti-os (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vda")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vda")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/image.scm b/gnu/tests/image.scm index be6852cae0..8d960cf7b8 100644 --- a/gnu/tests/image.scm +++ b/gnu/tests/image.scm @@ -55,7 +55,9 @@ (define %simple-efi-os (inherit %simple-os) (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")))))) + (targets (list (bootloader-target + (type 'esp) + (path "/boot/efi")))))))) ;; An MBR disk image with a single ext4 partition. (define i1 diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 57b2a77414..87eb2bf7fe 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -103,7 +103,9 @@ (define-os-with-source (%minimal-os %minimal-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -141,7 +143,9 @@ (define-os-with-source (%minimal-extlinux-os (bootloader (bootloader-configuration (bootloader extlinux-gpt-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -434,7 +438,9 @@ (define-os-with-source (%minimal-os-on-vda %minimal-os-on-vda-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vda")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vda")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -510,7 +516,9 @@ (define-os-with-source (%separate-home-os %separate-home-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device (file-system-label "my-root")) @@ -565,7 +573,9 @@ (define-os-with-source (%separate-store-os %separate-store-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device (file-system-label "root-fs")) @@ -642,7 +652,9 @@ (define-os-with-source (%raid-root-os %raid-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) ;; Add a kernel module for RAID-1 (aka. "mirror"). @@ -725,7 +737,9 @@ (define-os-with-source (%encrypted-root-os %encrypted-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt ;; detection logic in 'enter-luks-passphrase'. @@ -858,7 +872,9 @@ (define-os-with-source (%lvm-separate-home-os %lvm-separate-home-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (mapped-devices (list (mapped-device @@ -943,7 +959,9 @@ (define-os-with-source (%encrypted-home-os %encrypted-home-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt ;; detection logic in 'enter-luks-passphrase'. @@ -1070,7 +1088,9 @@ (define-os-with-source (%encrypted-home-os-key-file (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))) (extra-initrd "/key-file.cpio"))) (kernel-arguments '("console=ttyS0")) @@ -1130,7 +1150,9 @@ (define-os-with-source (%encrypted-root-not-boot-os (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (mapped-devices (list (mapped-device (source @@ -1232,7 +1254,9 @@ (define-os-with-source (%btrfs-root-os %btrfs-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1306,7 +1330,9 @@ (define-os-with-source (%btrfs-raid-root-os %btrfs-raid-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system @@ -1374,7 +1400,9 @@ (define-os-with-source (%btrfs-root-on-subvolume-os (locale "en_US.UTF-8") (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device (file-system-label "btrfs-pool")) @@ -1464,9 +1492,13 @@ (define-os-with-source (%btrfs-raid10-root-os (host-name "hurd") (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (targets (list "/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde")))) + (bootloader (map (lambda (block-device) + (bootloader-configuration + (bootloader grub-bootloader) + (targets (list (bootloader-target + (type 'disk) + (device block-device)))))) + '("/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device (uuid "16ff18e2-eb41-4324-8df5-80d3b53c411b")) @@ -1575,7 +1607,9 @@ (define-os-with-source (%jfs-root-os %jfs-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1648,7 +1682,9 @@ (define-os-with-source (%f2fs-root-os %f2fs-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) @@ -1721,7 +1757,9 @@ (define-os-with-source (%xfs-root-os %xfs-root-os-source) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets (list "/dev/vdb")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/vdb")))))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device (file-system-label "my-root")) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 0d9972e0e9..2f97126df7 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -51,7 +51,9 @@ (define %base-os (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems %base-file-systems) (users %base-user-accounts) (packages (cons* diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index f03ea963f7..ee858d9c91 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -90,7 +90,9 @@ (define* (make-jami-os #:key provisioning? partial?) (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/gnu/tests/vnc.scm b/gnu/tests/vnc.scm index ab1c2749f3..cba9c565e0 100644 --- a/gnu/tests/vnc.scm +++ b/gnu/tests/vnc.scm @@ -51,7 +51,9 @@ (define %xvnc-os (locale "en_US.UTF-8") (bootloader (bootloader-configuration (bootloader grub-bootloader) - (targets '("/dev/sdX")))) + (targets (list (bootloader-target + (type 'disk) + (device "/dev/sdX")))))) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm index e1dc4620c3..f3ba76e998 100644 --- a/tests/boot-parameters.scm +++ b/tests/boot-parameters.scm @@ -65,7 +65,7 @@ (define %root-path "/") (define %grub-boot-parameters (boot-parameters - (bootloader-name 'grub) + (bootloader-name '(grub)) (root-device %default-root-device) (label %default-label) (kernel %default-kernel)