Merge pull request #885 from netbootxyz/ubuntu_live

Add 21.04 to live-ubuntu

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 ## [2.0.37]
+### Added
+- Ubuntu 21.04 Installer and Live Versions
+### Fixes
+- Version number variable tweaks
 
 ## [2.0.36]
 ### Added

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

@@ -7,6 +7,7 @@ set os Ubuntu Live
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
+item hirsute ${space} ${os} 21.04
 item groovy ${space} ${os} 20.10
 item focal ${space} ${os} 20.04
 item bionic ${space} ${os} 18.04
@@ -15,10 +16,18 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:hirsute
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "ubuntu" and 'squash' in key and value.version == "21.04" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :groovy
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "20.10" %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
 {% endif %}
 {% endfor %}
 goto flavor_select
@@ -26,7 +35,7 @@ goto flavor_select
 :focal
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "20.04" %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
 {% endif %}
 {% endfor %}
 goto flavor_select
@@ -34,7 +43,7 @@ goto flavor_select
 :bionic
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "18.04" %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
 {% endif %}
 {% endfor %}
 goto flavor_select
@@ -65,12 +74,8 @@ initrd ${kernel_url}initrd
 boot
 
 :20.04-boot
-imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
-initrd ${kernel_url}initrd
-boot
-
 :20.10-boot
+:21.04-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
 initrd ${kernel_url}initrd