ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-06 23:16:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tests: Update tests to new targets system.

Browse source 
* gnu/services/virtualization.scm
(%virtual-build-machine-operating-system): Remove bootloader.
(%hurd-vm-operating-system): Remove targets.
* gnu/system/hurd.scm (%hurd-default-operating-system): Remove targets.
* gnu/system/images/wsl2.scm (dummy-bootloader): Delete variable.
(wsl-os)[bootloader]: Don't provide field.
* gnu/system/vm.scm (virtualized-operating-system): Don't provide
bootloader.
* gnu/tests.scm (%simple-os), gnu/tests/ganeti.scm (%ganeti-os),
gnu/tests/image.scm (%simple-efi-os), gnu/tests/nfs.scm (%base-os),
gnu/tests/telephony.scm (make-jami-os), gnu/tests/vnc.scm (%xvnc-os):
Update bootloader targets.
* gnu/tests/install.scm (%minimal-os, %minimal-extlinux-os,
%minimal-os-on-vda, %separate-home-os, %separate-store-os,
%raid-root-os, %encrypted-root-os, %lvm-separate-home-os,
%encrypted-home-os, %encrypted-home-os-key-file,
%encrypted-root-not-boot-os, %btrfs-root-os-source,
%btrfs-raid-root-os-source, %btrfs-root-on-subvolume-os,
%btrfs-raid10-root-os, %jfs-root-os, %f2fs-root-os, %xfs-root-os):
Update bootloader targets.
(%btrfs-raid10-root-os): Use multiple bootloaders.

Change-Id: I3d66a839a9b2a73b8b65946950728b1e0155ca1e
This commit is contained in:
Lilah Tascheter 2024-08-06 19:11:27 -05:00 committed by Ryan Schanzenbacher
parent d43e1a34ad
commit e2e20d4002
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
12 changed files with 82 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/services/virtualization.scm
View file

@ -1191,17 +1191,13 @@ (define %minimal-vm-syslog-config
(define %virtual-build-machine-operating-system (define %virtual-build-machine-operating-system
(operating-system (operating-system
(host-name "build-machine") (host-name "build-machine")
(locale "en_US.utf8") (locale "en_US.utf8")
(locale-definitions (locale-definitions
;; Save space by providing only one locale. ;; Save space by providing only one locale.
(list (locale-definition (name "en_US.utf8") (list (locale-definition (name "en_US.utf8")
(source "en_US") (source "en_US")
(charset "UTF-8")))) (charset "UTF-8"))))
;; no bootloader
(bootloader (bootloader-configuration ;unused
(bootloader grub-minimal-bootloader)
(targets '("/dev/null"))))
(file-systems (cons (file-system ;unused (file-systems (cons (file-system ;unused
(mount-point "/") (mount-point "/")
(device "none") (device "none")
@ -1624,9 +1620,8 @@ (define %hurd-vm-operating-system
(host-name "childhurd") (host-name "childhurd")
(timezone "Europe/Amsterdam") (timezone "Europe/Amsterdam")
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-minimal-bootloader) (bootloader grub-minimal-bootloader)
(targets '("/dev/vda")) (timeout 0)))
(timeout 0)))
(packages (cons* gdb-minimal (packages (cons* gdb-minimal
(operating-system-packages (operating-system-packages
%hurd-default-operating-system))) %hurd-default-operating-system)))

4
gnu/system/hurd.scm
View file

@ -119,9 +119,7 @@ (define %hurd-default-operating-system
(kernel %hurd-default-operating-system-kernel) (kernel %hurd-default-operating-system-kernel)
(kernel-arguments '()) (kernel-arguments '())
(hurd hurd) (hurd hurd)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration (bootloader grub-minimal-bootloader)))
(bootloader grub-minimal-bootloader)
(targets '("/dev/vda"))))
(initrd #f) (initrd #f)
(initrd-modules '()) (initrd-modules '())
(firmware '()) (firmware '())

14
gnu/system/images/wsl2.scm
View file

@ -127,16 +127,6 @@ (define dummy-package
(description #f) (description #f)
(license (fsdg-compatible "dummy")))) (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-kernel dummy-package)
(define (dummy-initrd . _rest) (define (dummy-initrd . _rest)
@ -146,9 +136,7 @@ (define-public wsl-os
(operating-system (operating-system
(host-name "gnu") (host-name "gnu")
(timezone "Etc/UTC") (timezone "Etc/UTC")
(bootloader ;; no bootloader
(bootloader-configuration
(bootloader dummy-bootloader)))
(kernel dummy-kernel) (kernel dummy-kernel)
(initrd dummy-initrd) (initrd dummy-initrd)
(initrd-modules '()) (initrd-modules '())

11
gnu/system/vm.scm
View file

@ -172,17 +172,6 @@ (define virtual-file-systems
(operating-system (operating-system
(inherit os) (inherit os)
;; XXX: Until we run QEMU with UEFI support (with the OVMF firmware),
;; force the traditional i386/BIOS method.
;; See <https://bugs.gnu.org/28768>.
(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) (initrd (lambda (file-systems . rest)
(apply (operating-system-initrd os) (apply (operating-system-initrd os)
file-systems file-systems

4
gnu/tests.scm
View file

@ -237,7 +237,9 @@ (define %simple-os
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device"/dev/sdX"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
(mount-point "/") (mount-point "/")

4
gnu/tests/ganeti.scm
View file

@ -40,7 +40,9 @@ (define %ganeti-os
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/vda")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vda"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
(mount-point "/") (mount-point "/")

4
gnu/tests/image.scm
View file

@ -55,7 +55,9 @@ (define %simple-efi-os
(inherit %simple-os) (inherit %simple-os)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-efi-bootloader) (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. ;; An MBR disk image with a single ext4 partition.
(define i1 (define i1

78
gnu/tests/install.scm
View file

@ -103,7 +103,9 @@ (define-os-with-source (%minimal-os %minimal-os-source)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
@ -141,7 +143,9 @@ (define-os-with-source (%minimal-extlinux-os
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader extlinux-gpt-bootloader) (bootloader extlinux-gpt-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vda")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vda"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device (file-system-label "root-fs")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
;; Add a kernel module for RAID-1 (aka. "mirror"). ;; 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 (bootloader-configuration
(bootloader grub-bootloader) (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 ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt
;; detection logic in 'enter-luks-passphrase'. ;; 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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(mapped-devices (list (mapped-device (mapped-devices (list (mapped-device
@ -943,7 +959,9 @@ (define-os-with-source (%encrypted-home-os %encrypted-home-os-source)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (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 ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt
;; detection logic in 'enter-luks-passphrase'. ;; detection logic in 'enter-luks-passphrase'.
@ -1070,7 +1088,9 @@ (define-os-with-source (%encrypted-home-os-key-file
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))
(extra-initrd "/key-file.cpio"))) (extra-initrd "/key-file.cpio")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
@ -1130,7 +1150,9 @@ (define-os-with-source (%encrypted-root-not-boot-os
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(mapped-devices (list (mapped-device (mapped-devices (list (mapped-device
(source (source
@ -1232,7 +1254,9 @@ (define-os-with-source (%btrfs-root-os %btrfs-root-os-source)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
@ -1374,7 +1400,9 @@ (define-os-with-source (%btrfs-root-on-subvolume-os
(locale "en_US.UTF-8") (locale "en_US.UTF-8")
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device (file-system-label "btrfs-pool")) (device (file-system-label "btrfs-pool"))
@ -1464,9 +1492,13 @@ (define-os-with-source (%btrfs-raid10-root-os
(host-name "hurd") (host-name "hurd")
(timezone "Europe/Paris") (timezone "Europe/Paris")
(locale "en_US.UTF-8") (locale "en_US.UTF-8")
(bootloader (bootloader-configuration (bootloader (map (lambda (block-device)
(bootloader grub-bootloader) (bootloader-configuration
(targets (list "/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde")))) (bootloader grub-bootloader)
(targets (list (bootloader-target
(type 'disk)
(device block-device))))))
'("/dev/vdb" "/dev/vdc" "/dev/vdd" "/dev/vde")))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(device (uuid "16ff18e2-eb41-4324-8df5-80d3b53c411b")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (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 (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets (list "/dev/vdb")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/vdb"))))))
(kernel-arguments '("console=ttyS0")) (kernel-arguments '("console=ttyS0"))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))

4
gnu/tests/nfs.scm
View file

@ -51,7 +51,9 @@ (define %base-os
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
(file-systems %base-file-systems) (file-systems %base-file-systems)
(users %base-user-accounts) (users %base-user-accounts)
(packages (cons* (packages (cons*

4
gnu/tests/telephony.scm
View file

@ -90,7 +90,9 @@ (define* (make-jami-os #:key provisioning? partial?)
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
(mount-point "/") (mount-point "/")

4
gnu/tests/vnc.scm
View file

@ -51,7 +51,9 @@ (define %xvnc-os
(locale "en_US.UTF-8") (locale "en_US.UTF-8")
(bootloader (bootloader-configuration (bootloader (bootloader-configuration
(bootloader grub-bootloader) (bootloader grub-bootloader)
(targets '("/dev/sdX")))) (targets (list (bootloader-target
(type 'disk)
(device "/dev/sdX"))))))
(file-systems (cons (file-system (file-systems (cons (file-system
(device (file-system-label "my-root")) (device (file-system-label "my-root"))
(mount-point "/") (mount-point "/")

2
tests/boot-parameters.scm
View file

@ -65,7 +65,7 @@ (define %root-path "/")
(define %grub-boot-parameters (define %grub-boot-parameters
(boot-parameters (boot-parameters
(bootloader-name 'grub) (bootloader-name '(grub))
(root-device %default-root-device) (root-device %default-root-device)
(label %default-label) (label %default-label)
(kernel %default-kernel) (kernel %default-kernel)