Tuning dhcpproxy implementation for testing

roles/netbootxyz/templates/disks/netboot.xyz.j2

@@ -27,8 +27,11 @@ isset ${next-server} && isset ${proxydhcp/next-server} && goto choose-tftp || se
 # Load "proxy settings" from root server
 chain tftp://${next-server}/local-vars.ipxe || echo ${VARS_ERR}
 # Check if the proxy-dhcp-vars script has made any usable command about how to progress with a next-server and a proxy-next-server being set
-isset ${use_proxydhcp_settings} || prompt --key p --timeout 4000 DHCP proxy detected. Press ${bold}p${boldoff} to boot from && set use_proxydhcp_settings true
-isset ${use_proxydhcp_settings} || set use_proxydhcp_settings false
+isset ${use_proxydhcp_settings} && iseq ${use_proxydhcp_settings} true && goto set-next-server ||
+prompt --key p --timeout 4000 DHCP proxy detected, press ${bold}p${boldoff} to boot from ${proxydhcp/next-server}... && set use_proxydhcp_settings true || set use_proxydhcp_settings false
+goto set-next-server
+
+:set-next-server
 iseq ${use_proxydhcp_settings} true && set tftp-server ${proxydhcp/next-server} || set tftp-server ${next-server}
 goto load-custom-ipxe
 

roles/netbootxyz/templates/menu/netinfo.ipxe.j2

@@ -15,21 +15,11 @@ item --gap DHCP server:
 item dhcpserver ${space} ${netX/dhcp-server}
 item --gap Next-server:
 item nextserver ${space} ${next-server}
+iseq ${proxydhcp/next-server} && item --gap DHCP proxy next-server: ||
+iseq ${proxydhcp/next-server} && item proxy-nextserver ${space} ${proxydhcp/next-server} ||
+iseq ${proxydhcp/next-server} && item --gap Booted from DHCP proxy next-server: ||
+iseq ${proxydhcp/next-server} && iseq ${proxydhcp/next-server} ${tftp-server} && echo Yes || echo No (Using default next-server ${tftp-server})
 item --gap Filename:
 item filename ${space} ${netX/filename}
-isset ${proxydhcp/next-server} && goto proxydhcp ||
-goto choose
-
-:proxydhcp
-# Proxy DHCP info (Will only be displayed if proxydhcp is set)
-item --gap DHCP proxy present
-item proxy ${space} Yes || item proxy ${space} No
-item --gap DHCP proxy next-server ||
-item proxy-nextserver ${space} ${proxydhcp/next-server} ||
-item --gap Using DHCP proxy next-server ||
-iseq ${proxydhcp/next-server} ${tftp-server} && echo Yes || echo No (Using default next-server ${tftp-server})
-goto choose
-
-:choose
 choose empty ||
 exit