mirrors/netboot
1
0
Fork 0
mirror of https://github.com/danderson/netboot.git synced 2025-10-17 10:31:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch naming of FirmwareEFIBC/FirmwareEFI64

Browse Source 
Signed-off-by: Mathias Kaufmann <me@stei.gr>
This commit is contained in:
Mathias Kaufmann 2017-01-23 09:20:38 +01:00 committed by Dave Anderson
parent 6de5322b09
commit 574ee88ab1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pixiecore/main.go
View File

@ -23,7 +23,7 @@ import (
func main() { func main() {
cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustAsset("undionly.kpxe") cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustAsset("undionly.kpxe")
cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustAsset("ipxe-i386.efi") cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustAsset("ipxe-i386.efi")
cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustAsset("ipxe-x86_64.efi") cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustAsset("ipxe-x86_64.efi")
cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustAsset("ipxe-x86_64.efi") cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustAsset("ipxe-x86_64.efi")
cli.CLI() cli.CLI()
} }

4
pixiecore/cli/cli.go
View File

@ -156,10 +156,10 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server {
ret.Ipxe[pixiecore.FirmwareEFI32] = mustFile(ipxeEFI32) ret.Ipxe[pixiecore.FirmwareEFI32] = mustFile(ipxeEFI32)
} }
if ipxeEFI64 != "" { if ipxeEFI64 != "" {
ret.Ipxe[pixiecore.FirmwareEFIBC] = mustFile(ipxeEFI64) ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64)
} }
if ipxeEFI64 != "" { if ipxeEFI64 != "" {
ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64) ret.Ipxe[pixiecore.FirmwareEFIBC] = mustFile(ipxeEFI64)
} }
if timestamps { if timestamps {

6
pixiecore/pixiecore.go
View File

@ -125,15 +125,15 @@ const (
// Note the values match the values from RFC4578. // Note the values match the values from RFC4578.
FirmwareX86PC Firmware = 0 // "Classic" x86 BIOS with PXE/UNDI support. FirmwareX86PC Firmware = 0 // "Classic" x86 BIOS with PXE/UNDI support.
FirmwareEFI32 = 6 // 32-bit x86 processor running EFI FirmwareEFI32 = 6 // 32-bit x86 processor running EFI
FirmwareEFIBC = 7 // 64-bit x86 processor running EFI FirmwareEFI64 = 7 // 64-bit x86 processor running EFI
FirmwareEFI64 = 9 // 64-bit x86 processor running EFI FirmwareEFIBC = 9 // 64-bit x86 processor running EFI
) )
var fwToArch = map[Firmware]Architecture{ var fwToArch = map[Firmware]Architecture{
FirmwareX86PC: ArchIA32, FirmwareX86PC: ArchIA32,
FirmwareEFI32: ArchIA32, FirmwareEFI32: ArchIA32,
FirmwareEFIBC: ArchX64,
FirmwareEFI64: ArchX64, FirmwareEFI64: ArchX64,
FirmwareEFIBC: ArchX64,
} }
// A Server boots machines using a Booter. // A Server boots machines using a Booter.