1
0
Эх сурвалжийг харах

Display network info for proxydhcp if set

Antony Messerli 3 жил өмнө
parent
commit
c2b3314681

+ 11 - 6
roles/netbootxyz/templates/menu/netinfo.ipxe.j2

@@ -17,14 +17,19 @@ item --gap Next-server:
 item nextserver ${space} ${next-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
-isset ${proxydhcp} && item proxy ${space} Yes || item proxy ${space} No
-isset ${proxydhcp} && item --gap DHCP proxy next-server ||
-isset ${proxydhcp} && item proxy-nextserver ${space} ${proxydhcp/next-server} ||
-isset ${proxydhcp} && item --gap Using DHCP proxy next-server ||
-isset ${proxydhcp} && iseq ${proxydhcp/next-server} ${tftp-server} && echo Yes || echo No (Using default next-server ${tftp-server})
-
+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