fup

recipes/alpine/locals.matchbox.pkr.hcl

@@ -71,8 +71,7 @@ locals {
         BootingMessage = "Booting from network the Cadoles way"
         DHCPRangeStart = ""
         DHCPRangeEnd = ""
-        DHCPLeaseDuration = "1h"
-        TFTPRoot = "/var/lib/tftpboot"
+        DHCPLeaseDuration = "12h"
       }
       MatchBox = {
         Hostname = "mb.cadoles.com"

recipes/alpine/matchbox.pkr.hcl

@@ -47,12 +47,6 @@ EOF
     destination = "/etc/local.d/initmatchbox.start"
     source = "${local.locations.provisionning}/conf/${build.name}/initmatchbox.start"
   }
-  
-  // Copy tftp provisionning script
-  provisioner "file" {
-    destination = "/etc/local.d/inittftp.start"
-    source = "${local.locations.provisionning}/conf/${build.name}/inittftp.start"
-  }
 
   // Generate default configuration for kubernetes
   provisioner "shell" {
@@ -85,7 +79,6 @@ EOF
   provisioner "shell" {
     inline = [ 
       "chmod +x /etc/local.d/initmatchbox.start",
-      "chmod +x /etc/local.d/inittftp.start",
       "chmod +x /etc/one-context.d/net-96-templater"
     ]
   }

recipes/alpine/provisionning/conf/matchbox/inittftp.start

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-dest="${1}"
-
-ipxeEFISource="http://boot.ipxe.org/ipxe.efi"
-kpxeSource="http://boot.ipxe.org/undionly.kpxe"
-
-cd "${dest}"
-wget "${ipxeEFISource}"
-wget "${kpxeSource}"

recipes/alpine/templates/conf/matchbox/dnsmasq.d/ipxe.conf.pktpl.hcl

@@ -13,25 +13,22 @@ strict-order
 addn-hosts=/etc/dnsmasq-hosts.conf
 domain=${Vars.PXE.DNSDomain}
 local=/${Vars.PXE.DNSDomain}/
-localise-queries
 
 
+enable-tftp
+
+pxe-prompt="${Vars.PXE.GreetingMessage}",${Vars.PXE.DelayTime}
+pxe-service=X86PC,"${Vars.PXE.BootingMessage}", http://${Vars.ETH0.IP}:${Vars.MatchBox.HTTPPort}/boot.ipxe
+
 %{ if Vars.PXE.DHCPMode == "proxy" }
-#dhcp-no-override
+dhcp-no-override
 dhcp-range=${Vars.ETH0.IP},proxy
 %{ else }
 dhcp-range=${Vars.PXE.DHCPRangeStart},${Vars.PXE.DHCPRangeEnd},${Vars.PXE.DHCPLeaseDuration}
-dhcp-option=option:router,${Vars.ETH0.GATEWAY}
+dhcp-option=option:router,${Vars.ETH0.Gateway}
 %{ endif }
-
 dhcp-option=option:dns-server,${Vars.ETH0.IP}
 dhcp-option=option:domain-name,${Vars.PXE.DNSDomain}
 
-# TFTP Configuration
-enable-tftp
-tftp-root="${Vars.PXE.TFTPRoot}"
-
-pxe-prompt="${Vars.PXE.GreetingMessage}",${Vars.PXE.DelayTime}
-pxe-service=tag:#ipxe,x86PC,"Legacy boot PXE chainload to iPXE",undionly.kpxe
-dhcp-userclass=set:ipxe,iPXE
-pxe-service=tag:ipxe,x86PC,"${Vars.PXE.BootingMessage} (iPXE)", http://${Vars.ETH0.IP}:${Vars.MatchBox.HTTPPort}/boot.ipxe
+dhcp-match=set:ipxe,175
+dhcp-vendorclass=BIOS,PXEClient:Arch:00000