From ee3f2e2b4b08c224efa6bef21f7bc30517ad7ff7 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Tue, 7 Jan 2025 00:08:40 -0600 Subject: [PATCH] Adds a check for local-vars for boot_timeout Closes: https://github.com/netbootxyz/netboot.xyz/issues/1482 --- roles/netbootxyz/templates/local-vars.ipxe.j2 | 3 +++ roles/netbootxyz/templates/menu/boot.cfg.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/netbootxyz/templates/local-vars.ipxe.j2 b/roles/netbootxyz/templates/local-vars.ipxe.j2 index 1df96629a4..9ed4913534 100644 --- a/roles/netbootxyz/templates/local-vars.ipxe.j2 +++ b/roles/netbootxyz/templates/local-vars.ipxe.j2 @@ -15,3 +15,6 @@ ### Sets the local live endpoint for the users local installation #set live_endpoint http://my_ip_address:8080 + +### Sets the default boot timeout +#set boot_timeout 300000 diff --git a/roles/netbootxyz/templates/menu/boot.cfg.j2 b/roles/netbootxyz/templates/menu/boot.cfg.j2 index 4d88388324..59449dd104 100644 --- a/roles/netbootxyz/templates/menu/boot.cfg.j2 +++ b/roles/netbootxyz/templates/menu/boot.cfg.j2 @@ -23,7 +23,7 @@ set sigs {{ sigs_location }} iseq ${platform} efi && set ipxe_disk netboot.xyz-snponly.efi || set ipxe_disk netboot.xyz-undionly.kpxe # set default boot timeout -set boot_timeout {{ boot_timeout }} +isset ${boot_timeout} || set boot_timeout {{ boot_timeout }} ################## # official mirrors