...

1 files changed, 12 insertions, 13 deletions

diff --git a/hosts/vidhar/network/dhcp/default.nix b/hosts/vidhar/network/dhcp/default.nix
index 22991094..f36d0c7f 100644
--- a/hosts/vidhar/network/dhcp/default.nix
+++ b/hosts/vidhar/network/dhcp/default.nix
@@ -7,8 +7,7 @@ let
   tftpIp = "10.141.0.1";
   ipxe = pkgs.ipxe.override {
     additionalTargets = {
-      "bin-i386-efi/snponly.efi" = "i386-snponly.efi";
-      "bin-x86_64-efi/snponly.efi" = "snponly.efi";
+      "bin-i386-efi/ipxe.efi" = "i386-ipxe.efi";
     };
     additionalOptions = [
       "NSLOOKUP_CMD"
@@ -66,23 +65,23 @@ in {
               option-data = [
                 { name = "vendor-class-identifier"; data = "HTTPClient"; }
               ];
-              boot-file-name = "${nfsrootBaseUrl}/snponly.efi";
+              boot-file-name = "${nfsrootBaseUrl}/ipxe.efi";
               only-if-required = true;
             }
 
             { name = "ipxe-uefi-64";
               test = "option[77].hex == 'iPXE' and (substring(option[60].hex,0,20) == 'PXEClient:Arch:00007' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00008' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00009')";
-              boot-file-name = "${nfsrootBaseUrl}/snponly.efi";
+              boot-file-name = "${nfsrootBaseUrl}/ipxe.efi";
               only-if-required = true;
             }
             { name = "ipxe-uefi-32";
               test = "option[77].hex == 'iPXE' and (substring(option[60].hex,0,20) == 'PXEClient:Arch:00002' or substring(option[60].hex,0,20) == 'PXEClient:Arch:00006')";
-              boot-file-name = "${nfsrootBaseUrl}/i386-snponly.efi";
+              boot-file-name = "${nfsrootBaseUrl}/i386-ipxe.efi";
               only-if-required = true;
             }
             { name = "ipxe-legacy";
               test = "option[77].hex == 'iPXE' and substring(option[60].hex,0,20) == 'PXEClient:Arch:00000'";
-              boot-file-name = "${nfsrootBaseUrl}/undionly.kpxe";
+              boot-file-name = "${nfsrootBaseUrl}/ipxe.lkrn";
               only-if-required = true;
             }
 
@@ -91,7 +90,7 @@ in {
               option-data = [
                 { name = "tftp-server-name"; data = tftpIp; }
               ];
-              boot-file-name = "snponly.efi";
+              boot-file-name = "ipxe.efi";
               only-if-required = true;
             }
             { name = "uefi-32";
@@ -99,7 +98,7 @@ in {
               option-data = [
                 { name = "tftp-server-name"; data = tftpIp; }
               ];
-              boot-file-name = "i386-snponly.efi";
+              boot-file-name = "i386-ipxe.efi";
               only-if-required = true;
             }
             { name = "legacy";
@@ -107,7 +106,7 @@ in {
               option-data = [
                 { name = "tftp-server-name"; data = tftpIp; }
               ];
-              boot-file-name = "undionly.kpxe";
+              boot-file-name = "ipxe.lkrn";
               only-if-required = true;
             }
           ];
@@ -351,7 +350,7 @@ in {
                       goto start
 
                       :memtest
-                      iseq ''${platform} efi && chain --autofree memtest.efi dark || chain --autofree memtest.bin dark
+                      iseq ''${platform} efi && chain --autofree memtest.efi || chain --autofree memtest.bin
                       goto start
                     '';
                   })
@@ -361,7 +360,7 @@ in {
               (pkgs.runCommandLocal "utils" {} ''
                 mkdir $out
                 install -m 0444 -t $out \
-                  ${ipxe}/{snponly.efi,i386-snponly.efi,undionly.kpxe} \
+                  ${ipxe}/{ipxe.efi,i386-ipxe.efi,ipxe.lkrn} \
                   ${pkgs.memtest86plus}/{memtest.efi,memtest.bin}
                 install -m 0444 ${sources.netbootxyz-efi.src} $out/netboot.xyz.efi
                 install -m 0444 ${sources.netbootxyz-lkrn.src} $out/netboot.xyz.lkrn
@@ -415,7 +414,7 @@ in {
                   goto start
 
                   :memtest
-                  iseq ''${platform} efi && chain --autofree memtest.efi dark || chain --autofree memtest.bin dark
+                  iseq ''${platform} efi && chain --autofree memtest.efi || chain --autofree memtest.bin
                   goto start
                 '';
               })
@@ -432,7 +431,7 @@ in {
         tftpRoot = pkgs.runCommandLocal "netboot" {} ''
           mkdir -p $out
           install -m 0444 -t $out \
-            ${ipxe}/{snponly.efi,i386-snponly.efi,undionly.kpxe}
+            ${ipxe}/{ipxe.efi,i386-ipxe.efi,ipxe.lkrn}
         '';
       in "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address=${tftpIp} ${tftpRoot}";
     };