Merge pull request #438 from netbootxyz/menu-updates

menu updates for new ISO assets

roles/netbootxyz/templates/menu/live-popos.ipxe.j2

@@ -3,19 +3,42 @@
 goto ${menu} ||
 
 :live_menu
-set os Pop OS
+set os Pop os Live
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
-item 18.04 ${space} ${os} 18.04
-item 19.10 ${space} ${os} 19.10
+item bionic ${space} ${os} 18.04
+item eoan ${space} ${os} 19.10
 choose live_version || goto live_exit
+menu ${os} ${live_version}
+item --gap ${os} Flavors
 goto ${live_version}
 
+:bionic
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "pop" and 'squash' in key and value.version == "18.04" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
+:eoan
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "pop" and 'squash' in key and value.version == "19.10" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
+:flavor_select
+choose flavor || goto live_menu
+echo ${cls}
+goto ${flavor} ||
+
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "pop" and 'squash' in key %}
 {% set kernel_name = value.kernel %}
-:{{ value.version }}
+:{{ key }}
 set squash_url ${live_endpoint}{{ value.path }}filesystem.squashfs
 {% for key, value in endpoints.items() | sort %}
 {% if key == kernel_name %}

roles/netbootxyz/templates/menu/live-voyager.ipxe.j2

@@ -15,7 +15,7 @@ goto ${live_version}
 
 :bionic
 set squash_url ${live_endpoint}{{ endpoints["voyager-bionic-squash"].path }}filesystem.squashfs
-set kernel_url ${live_endpoint}{{ endpoints["ubuntu-18.04-live-kernel"].path }}
+set kernel_url ${live_endpoint}{{ endpoints["voyager-bionic-squash"].path }}
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd
 initrd ${kernel_url}initrd
@@ -23,7 +23,7 @@ boot
 
 :buster
 set squash_url ${live_endpoint}{{ endpoints["voyager-buster-squash"].path }}filesystem.squashfs
-set kernel_url ${live_endpoint}{{ endpoints["debian-10-live-kernel"].path }}
+set kernel_url ${live_endpoint}{{ endpoints["voyager-buster-squash"].path }}
 imgfree
 kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd
 initrd ${kernel_url}initrd
@@ -31,7 +31,7 @@ boot
 
 :eoan
 set squash_url ${live_endpoint}{{ endpoints["voyager-eoan-squash"].path }}filesystem.squashfs
-set kernel_url ${live_endpoint}{{ endpoints["ubuntu-19.10-live-kernel"].path }}
+set kernel_url ${live_endpoint}{{ endpoints["voyager-eoan-squash"].path }}
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd
 initrd ${kernel_url}initrd