From e117567bf269fe4fe8b4e401f6c2b5b7157ac1c6 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 27 Feb 2019 02:09:33 +0100
Subject: [PATCH] Replace pxelinux by iPXE in UEFI mode

---
 server.yml | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/server.yml b/server.yml
index 928f8bd..d9756cc 100644
--- a/server.yml
+++ b/server.yml
@@ -544,14 +544,19 @@ files:
       authoritative;
       default-lease-time 7200;
       max-lease-time 7200;
+      option client-arch code 93 = unsigned integer 16;
       subnet 172.23.255.0 netmask 255.255.255.0 {
           range 172.23.255.10 172.23.255.254;
           #option routers 172.23.255.1;
           option subnet-mask 255.255.255.0;
           option broadcast-address 172.23.255.255;
           next-server 172.23.255.1;
-          #filename "bios/pxelinux.0";
-          filename "e64/syslinux.efi";
+          if option client-arch != 00:00 {
+              filename "ipxe.efi";
+              # filename "e64/syslinux.efi";
+          } else {
+              filename "bios/pxelinux.0";
+          }
       }
     mode: "0440"
 
@@ -593,40 +598,22 @@ files:
     directory: true
     mode: "0755"
 
-  - path: srv/tftp/e64/ldlinux.e64
-    source: /usr/share/syslinux/efi64/ldlinux.e64
-    mode: "0644"
-  - path: srv/tftp/e64/libcom32.c32
-    source: /usr/share/syslinux/efi64/libcom32.c32
-    mode: "0644"
-  - path: srv/tftp/e64/libutil.c32
-    source: /usr/share/syslinux/efi64/libutil.c32
-    mode: "0644"
-  - path: srv/tftp/e64/menu.c32
-    source: /usr/share/syslinux/menu.c32
-    mode: "0644"
-  - path: srv/tftp/e64/poweroff.c32
-    source: /usr/share/syslinux/poweroff.c32
-    mode: "0644"
-  - path: srv/tftp/e64/vesamenu.c32
-    source: /usr/share/syslinux/efi64/vesamenu.c32
-    mode: "0644"
-  - path: srv/tftp/e64/syslinux.efi
-    source: /usr/share/syslinux/efi64/syslinux.efi
-    mode: "0644"
-  - path: srv/tftp/e64/pxelinux.cfg
-    directory: true
-    mode: "0755"
-
   - path: srv/tftp/pxelinux.cfg/default
     source: tftp/pxelinux.cfg/default
     mode: "0644"
   - path: srv/tftp/pxelinux.cfg/tpl
     source: tftp/pxelinux.cfg/tpl
     mode: "0644"
+  - path: srv/tftp/pxelinux.cfg/tpl.ipxe
+    source: tftp/pxelinux.cfg/tpl.ipxe
+    mode: "0644"
+
+  - path: srv/tftp/ipxe.efi
+    source: tftp/ipxe.efi
+    mode: "0644"
 
   - path: srv/tftp/bzImage
-    source: tftp/bzImage
+    source: challenge-kernel
     mode: "0644"
   - path: srv/tftp/login-initrd.img
     source: tftp/login-initrd.img