Skip to content

Build snponly.efi to support newer dell servers #42

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

Closed
majst01 wants to merge 1 commit into from
Closed

Build snponly.efi to support newer dell servers #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
2 changes: 2 additions & 0 deletions pixiecore/dhcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 2 additions & 0 deletions pixiecore/pxe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down