Browse Source

Drop 20.10 from menus

Antony Messerli 3 years ago
parent
commit
c72cc13cde

+ 0 - 2
roles/netbootxyz/defaults/main.yml

@@ -565,8 +565,6 @@ releases:
     versions:
     - code_name: hirsute
       name: 21.04 Hirsute Hippo
-    - code_name: groovy
-      name: 20.10 Groovy Gorilla
     - code_name: focal
       name: 20.04 LTS Focal Fossa (Subiquity)
     - code_name: focal-legacy

+ 0 - 10
roles/netbootxyz/templates/menu/live-popos.ipxe.j2

@@ -7,7 +7,6 @@ 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 groovy ${space} ${os} 20.10
 item focal ${space} ${os} 20.04
 item bionic ${space} ${os} 18.04
 choose live_version || goto live_exit
@@ -15,14 +14,6 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
-:groovy
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "pop" and 'squash' in key and value.version == "20.10" %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
-{% endif %}
-{% endfor %}
-goto flavor_select
-
 :focal
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "pop" and 'squash' in key and value.version == "20.04" %}
@@ -65,7 +56,6 @@ initrd ${kernel_url}initrd
 boot
 
 :20.04-boot
-:20.10-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

+ 0 - 10
roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2

@@ -8,7 +8,6 @@ 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
 choose live_version || goto live_exit
@@ -24,14 +23,6 @@ item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flav
 {% 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 }}
-{% endif %}
-{% endfor %}
-goto flavor_select
-
 :focal
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "ubuntu" and 'squash' in key and value.version == "20.04" %}
@@ -74,7 +65,6 @@ initrd ${kernel_url}initrd
 boot
 
 :20.04-boot
-:20.10-boot
 :21.04-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}

+ 0 - 1
roles/netbootxyz/templates/menu/ubuntu.ipxe.j2

@@ -23,7 +23,6 @@ item older_release ${space} Set release codename...
 choose ubuntu_version || goto ubuntu_exit
 iseq ${ubuntu_version} older_release && goto older_release ||
 iseq ${ubuntu_version} focal && set install_type sub ||
-iseq ${ubuntu_version} groovy && set install_type sub ||
 iseq ${ubuntu_version} hirsute && set install_type sub ||
 iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal ||
 iseq ${install_type} sub && goto boot_type ||