Skip to content

Commit 01c9f45

Browse files
sstelfoxsmira
authored andcommitted
fix: arch linux search paths and names for QEMU provisioner
Addresses old and recent change combination that prevents qemu provisioning on ArchLinux by adding a default search path and the filenames the package maintainer used. Signed-off-by: Sam Stelfox <[email protected]> Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit aea9894)
1 parent 8b5c5f1 commit 01c9f45

File tree

1 file changed

+4
-0
lines changed
  • pkg/provision/providers/qemu

1 file changed

+4
-0
lines changed

pkg/provision/providers/qemu/arch.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,13 @@ func (arch Arch) PFlash(uefiEnabled bool, extraUEFISearchPaths []string) []PFlas
129129
"/usr/share/ovmf",
130130
"/usr/share/OVMF",
131131
"/usr/share/qemu",
132+
"/usr/share/ovmf/x64", // Arch Linux
132133
}
133134

134135
// Secure boot enabled firmware files
135136
uefiSourceFiles := []string{
136137
"OVMF_CODE_4M.secboot.fd",
138+
"OVMF_CODE.secboot.4m.fd", // Arch Linux
137139
"OVMF_CODE.secboot.fd",
138140
"OVMF.secboot.fd",
139141
"edk2-x86_64-secure-code.fd", // Alpine Linux
@@ -143,6 +145,7 @@ func (arch Arch) PFlash(uefiEnabled bool, extraUEFISearchPaths []string) []PFlas
143145
// Non-secure boot firmware files
144146
uefiSourceFilesInsecure := []string{
145147
"OVMF_CODE_4M.fd",
148+
"OVMF_CODE.4m.fd", // Arch Linux
146149
"OVMF_CODE.fd",
147150
"OVMF.fd",
148151
"ovmf-x86_64-4m-code.bin",
@@ -151,6 +154,7 @@ func (arch Arch) PFlash(uefiEnabled bool, extraUEFISearchPaths []string) []PFlas
151154
// Empty vars files
152155
uefiVarsFiles := []string{
153156
"OVMF_VARS_4M.fd",
157+
"OVMF_VARS.4m.fd", // Arch Linux
154158
"OVMF_VARS.fd",
155159
"ovmf-x86_64-4m-vars.bin",
156160
}

0 commit comments

Comments
 (0)