Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak EDK2 paths #1033

Merged
merged 3 commits into from
Jul 22, 2024
Merged

Tweak EDK2 paths #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b093d0
incusd/isntance/edk2: Move seabios to /usr/share/qemu
stgraber Jul 21, 2024
9072c73
incusd/isntance/edk2: Add ArchLinux x86_64 paths
stgraber Jul 21, 2024
09cb825
tests: Use future values in property test
stgraber Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion internal/server/instance/drivers/edk2/driver_edk2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ var architectureInstallations = map[int][]Installation{
{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
},
CSM: {
{Code: "seabios.bin", Vars: "seabios.bin"},
{Code: "OVMF_CODE.4MB.CSM.fd", Vars: "OVMF_VARS.4MB.CSM.fd"},
{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
{Code: "OVMF_CODE.2MB.CSM.fd", Vars: "OVMF_VARS.2MB.CSM.fd"},
Expand All @@ -69,6 +68,7 @@ var architectureInstallations = map[int][]Installation{
Path: "/usr/share/qemu",
Usage: map[FirmwareUsage][]FirmwarePair{
GENERIC: {
{Code: "seabios.bin", Vars: "seabios.bin"},
{Code: "ovmf-x86_64-4m-code.bin", Vars: "ovmf-x86_64-4m-vars.bin"},
{Code: "ovmf-x86_64.bin", Vars: "ovmf-x86_64-code.bin"},
},
Expand All @@ -77,6 +77,22 @@ var architectureInstallations = map[int][]Installation{
{Code: "ovmf-x86_64-ms-code.bin", Vars: "ovmf-x86_64-ms-vars.bin"},
},
},
}, {
Path: "/usr/share/OVMF/x64",
Usage: map[FirmwareUsage][]FirmwarePair{
GENERIC: {
{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
},
CSM: {
{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
{Code: "OVMF_CODE.csm.fd", Vars: "OVMF_VARS.fd"},
},
SECUREBOOT: {
{Code: "OVMF_CODE.secboot.4m.fd", Vars: "OVMF_VARS.4m.fd"},
{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.fd"},
},
},
}},
osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN: {{
Path: "/usr/share/AAVMF",
Expand Down
7 changes: 3 additions & 4 deletions test/suites/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,12 @@ test_property() {

# Create a snap of the instance to set its expiration timestamp
incus snapshot create foo s1
incus config set foo/s1 expires_at="2024-03-23T17:38:37.753398689-04:00" --property
incus config get foo/s1 expires_at --property | grep -q "2024-03-23 17:38:37.753398689 -0400 -0400"
incus config show foo/s1 | grep -q "expires_at: 2024-03-23T17:38:37.753398689-04:00"
incus config set foo/s1 expires_at="2050-01-01T10:10:10.753398689-04:00" --property
incus config get foo/s1 expires_at --property | grep -q "2050-01-01 10:10:10.753398689 -0400 -0400"
incus config show foo/s1 | grep -q "expires_at: 2050-01-01T10:10:10.753398689-04:00"
incus config unset foo/s1 expires_at --property
incus config show foo/s1 | grep -q "expires_at: 0001-01-01T00:00:00Z"


# Create a storage volume, create a volume snapshot and set its expiration timestamp
# shellcheck disable=2039,3043
local storage_pool
Expand Down
Loading