2
0
mirror of https://github.com/xcat2/confluent.git synced 2026-11-19 08:52:20 +00:00

Merge remote-tracking branch 'xcat/master'

This commit is contained in:
Jarrod Johnson
2026-11-18 12:18:13 -05:00
@@ -800,9 +800,10 @@ async def reply_dhcp4(node, info, packet, cfg, reqview, httpboot, cfd, profile,
can302 = True
proto = 'https' if insecuremode == 'never' else 'http'
if isboot and httpboot:
shimarch = 'aarch64' if bootarch == 'uefi-httpboot-arm' else 'x86_64'
if (proto in ('http', 'https')
and os.path.exists('/var/lib/confluent/public/os/{}/boot.ipxe.shim'.format(profile))
and os.path.exists('/var/lib/confluent/public/ipxe/x86_64/ipxe-shim.efi')):
and os.path.exists('/var/lib/confluent/public/ipxe/{}/ipxe-shim.efi'.format(shimarch))):
if bootarch == 'uefi-httpboot':
bootfile = '{0}://{1}/confluent-public/ipxe/x86_64/ipxe-shim.efi'.format(
proto, myipn