From 574ee88ab174316ae4b4d97b3df7bc2a8923a3e9 Mon Sep 17 00:00:00 2001 From: Mathias Kaufmann Date: Mon, 23 Jan 2017 09:20:38 +0100 Subject: [PATCH] Switch naming of FirmwareEFIBC/FirmwareEFI64 Signed-off-by: Mathias Kaufmann --- cmd/pixiecore/main.go | 4 ++-- pixiecore/cli/cli.go | 4 ++-- pixiecore/pixiecore.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/pixiecore/main.go b/cmd/pixiecore/main.go index e76bee3..fc9b508 100644 --- a/cmd/pixiecore/main.go +++ b/cmd/pixiecore/main.go @@ -23,7 +23,7 @@ import ( func main() { cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustAsset("undionly.kpxe") 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() } diff --git a/pixiecore/cli/cli.go b/pixiecore/cli/cli.go index 06dc197..30aa030 100644 --- a/pixiecore/cli/cli.go +++ b/pixiecore/cli/cli.go @@ -156,10 +156,10 @@ func serverFromFlags(cmd *cobra.Command) *pixiecore.Server { ret.Ipxe[pixiecore.FirmwareEFI32] = mustFile(ipxeEFI32) } if ipxeEFI64 != "" { - ret.Ipxe[pixiecore.FirmwareEFIBC] = mustFile(ipxeEFI64) + ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64) } if ipxeEFI64 != "" { - ret.Ipxe[pixiecore.FirmwareEFI64] = mustFile(ipxeEFI64) + ret.Ipxe[pixiecore.FirmwareEFIBC] = mustFile(ipxeEFI64) } if timestamps { diff --git a/pixiecore/pixiecore.go b/pixiecore/pixiecore.go index 72b116c..62db82c 100644 --- a/pixiecore/pixiecore.go +++ b/pixiecore/pixiecore.go @@ -125,15 +125,15 @@ const ( // Note the values match the values from RFC4578. FirmwareX86PC Firmware = 0 // "Classic" x86 BIOS with PXE/UNDI support. FirmwareEFI32 = 6 // 32-bit x86 processor running EFI - FirmwareEFIBC = 7 // 64-bit x86 processor running EFI - FirmwareEFI64 = 9 // 64-bit x86 processor running EFI + FirmwareEFI64 = 7 // 64-bit x86 processor running EFI + FirmwareEFIBC = 9 // 64-bit x86 processor running EFI ) var fwToArch = map[Firmware]Architecture{ FirmwareX86PC: ArchIA32, FirmwareEFI32: ArchIA32, - FirmwareEFIBC: ArchX64, FirmwareEFI64: ArchX64, + FirmwareEFIBC: ArchX64, } // A Server boots machines using a Booter.