diff --git a/Makefile b/Makefile index c3a3bf7..ae9e6d7 100644 --- a/Makefile +++ b/Makefile @@ -47,9 +47,10 @@ ipxe: ) cp ipxe/branding.h ipxe/ipxe/src/config/local/branding.h (cd ipxe/ipxe/src &&\ - make bin/ipxe.pxe bin/undionly.kpxe bin-x86_64-efi/ipxe.efi bin-i386-efi/ipxe.efi EMBED=../../../pixiecore/boot.ipxe) + make bin/ipxe.pxe bin/undionly.kpxe bin-x86_64-efi/ipxe.efi bin-x86_64-efi/snponly.efi bin-i386-efi/ipxe.efi EMBED=../../../pixiecore/boot.ipxe) (rm -rf ipxe/ipxe/bin && mkdir ipxe/ipxe/bin) mv -f ipxe/ipxe/src/bin/ipxe.pxe ipxe/ipxe/bin/ipxe.pxe + mv -f ipxe/ipxe/src/bin-x86_64-efi/snponly.efi ipxe/ipxe/bin/snponly.efi mv -f ipxe/ipxe/src/bin/undionly.kpxe ipxe/ipxe/bin/undionly.kpxe mv -f ipxe/ipxe/src/bin-x86_64-efi/ipxe.efi ipxe/ipxe/bin/ipxe-x86_64.efi mv -f ipxe/ipxe/src/bin-i386-efi/ipxe.efi ipxe/ipxe/bin/ipxe-i386.efi diff --git a/cmd/main.go b/cmd/main.go index 4ab4e93..b8082f9 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -23,8 +23,9 @@ import ( func main() { cli.Ipxe[pixiecore.FirmwareX86PC] = ipxe.MustGet("undionly.kpxe") cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustGet("ipxe-i386.efi") - cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustGet("ipxe-x86_64.efi") + cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustGet("snponly.efi") cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustGet("ipxe-x86_64.efi") - cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustGet("ipxe.pxe") + // FIXME just a workaround for dell server + cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustGet("snponly.efi") cli.CLI() } diff --git a/pixiecore/dhcp.go b/pixiecore/dhcp.go index dbf7657..e07129f 100644 --- a/pixiecore/dhcp.go +++ b/pixiecore/dhcp.go @@ -162,6 +162,8 @@ func (s *Server) validateDHCP(pkt *dhcp4.Packet) (mach Machine, fwtype Firmware, if err != nil { return mach, 0, fmt.Errorf("error decoding client GUID (option 97): %w", err) } + + s.Log.Info("dhcp", "firmwaretype", fwtype, "mach", mach) return mach, fwtype, nil } diff --git a/pixiecore/pxe.go b/pixiecore/pxe.go index ff5df7b..ba3af2b 100644 --- a/pixiecore/pxe.go +++ b/pixiecore/pxe.go @@ -122,6 +122,8 @@ func (s *Server) validatePXE(pkt *dhcp4.Packet) (fwtype Firmware, err error) { return 0, errors.New("malformed client GUID (option 97), wrong size") } + s.Log.Info("pxe", "firmwaretype", fwtype) + return fwtype, nil }