Skip to content

Commit 333a13d

Browse files
committed
Build snponly.efi to support newer dell servers
1 parent 23d6e35 commit 333a13d

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ ipxe:
4747
)
4848
cp ipxe/branding.h ipxe/ipxe/src/config/local/branding.h
4949
(cd ipxe/ipxe/src &&\
50-
make bin/ipxe.pxe bin/undionly.kpxe bin-x86_64-efi/ipxe.efi bin-i386-efi/ipxe.efi EMBED=../../../pixiecore/boot.ipxe)
50+
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)
5151
(rm -rf ipxe/ipxe/bin && mkdir ipxe/ipxe/bin)
5252
mv -f ipxe/ipxe/src/bin/ipxe.pxe ipxe/ipxe/bin/ipxe.pxe
53+
mv -f ipxe/ipxe/src/bin-x86_64-efi/snponly.efi ipxe/ipxe/bin/snponly.efi
5354
mv -f ipxe/ipxe/src/bin/undionly.kpxe ipxe/ipxe/bin/undionly.kpxe
5455
mv -f ipxe/ipxe/src/bin-x86_64-efi/ipxe.efi ipxe/ipxe/bin/ipxe-x86_64.efi
5556
mv -f ipxe/ipxe/src/bin-i386-efi/ipxe.efi ipxe/ipxe/bin/ipxe-i386.efi

cmd/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ func main() {
2525
cli.Ipxe[pixiecore.FirmwareEFI32] = ipxe.MustGet("ipxe-i386.efi")
2626
cli.Ipxe[pixiecore.FirmwareEFI64] = ipxe.MustGet("ipxe-x86_64.efi")
2727
cli.Ipxe[pixiecore.FirmwareEFIBC] = ipxe.MustGet("ipxe-x86_64.efi")
28-
cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustGet("ipxe.pxe")
28+
// FIXME just a workaround for dell server
29+
cli.Ipxe[pixiecore.FirmwareX86Ipxe] = ipxe.MustGet("snponly.efi")
2930
cli.CLI()
3031
}

pixiecore/dhcp.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ func (s *Server) validateDHCP(pkt *dhcp4.Packet) (mach Machine, fwtype Firmware,
162162
if err != nil {
163163
return mach, 0, fmt.Errorf("error decoding client GUID (option 97): %w", err)
164164
}
165+
166+
s.Log.Info("dhcp", "firmwaretype", fwtype, "mach", mach)
165167
return mach, fwtype, nil
166168
}
167169

pixiecore/pxe.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ func (s *Server) validatePXE(pkt *dhcp4.Packet) (fwtype Firmware, err error) {
122122
return 0, errors.New("malformed client GUID (option 97), wrong size")
123123
}
124124

125+
s.Log.Info("pxe", "firmwaretype", fwtype)
126+
125127
return fwtype, nil
126128
}
127129

0 commit comments

Comments
 (0)