Procházet zdrojové kódy

Merge pull request #1365 from netbootxyz/relax-filename-checks

Relax checks on tftp filename in bootloader
Antony Messerli před 1 rokem
rodič
revize
50ab75d63d
1 změnil soubory, kde provedl 1 přidání a 6 odebrání
  1. 1 6
      roles/netbootxyz/templates/disks/netboot.xyz.j2

+ 1 - 6
roles/netbootxyz/templates/disks/netboot.xyz.j2

@@ -39,12 +39,7 @@ iseq ${use_proxydhcp_settings} true && set tftp-server ${proxydhcp/next-server}
 goto load-custom-ipxe
 
 :load-custom-ipxe
-isset ${tftp-server} && iseq ${filename} {{ site_name }}.kpxe && goto tftpmenu ||
-isset ${tftp-server} && iseq ${filename} {{ site_name }}-undionly.kpxe && goto tftpmenu ||
-isset ${tftp-server} && iseq ${filename} {{ site_name }}.efi && goto tftpmenu ||
-isset ${tftp-server} && iseq ${filename} {{ site_name }}-snp.efi && goto tftpmenu ||
-isset ${tftp-server} && iseq ${filename} {{ site_name }}-snponly.efi && goto tftpmenu ||
-isset ${tftp-server} && iseq ${filename} {{ site_name }}-arm64.efi && goto tftpmenu ||
+isset ${tftp-server} && isset ${filename} && goto tftpmenu ||
 goto menu
 
 :failsafe