Prechádzať zdrojové kódy

Add Ubuntu 20.10 Groovy Gorilla

Adds groovy, drops eoan, updates live menu for new version
and drops 19.10.
Antony 4 rokov pred
rodič
commit
dd5c7aa11d

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

@@ -511,10 +511,10 @@ releases:
     mirror: http://archive.ubuntu.com
     name: Ubuntu
     versions:
+    - code_name: groovy
+      name: 20.10 Groovy Gorilla
     - code_name: focal
       name: 20.04 LTS Focal Fossa
-    - code_name: eoan
-      name: 19.10 Eoan Ermine
     - code_name: bionic
       name: 18.04 LTS Bionic Beaver
     - code_name: xenial

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

@@ -7,33 +7,33 @@ 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 groovy ${space} ${os} 20.10
 item focal ${space} ${os} 20.04
 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}
 
-:focal
+:groovy
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "ubuntu" and 'squash' in key and value.version == "20.04" %}
+{% 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
 
-:bionic
+:focal
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "ubuntu" and 'squash' in key and value.version == "18.04" %}
+{% if value.os == "ubuntu" and 'squash' in key and value.version == "20.04" %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
 goto flavor_select
 
-:eoan
+:bionic
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "ubuntu" and 'squash' in key and value.version == "19.10" %}
+{% if value.os == "ubuntu" and 'squash' in key and value.version == "18.04" %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
@@ -64,13 +64,13 @@ kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url}
 initrd ${kernel_url}initrd
 boot
 
-:19.10-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.04-boot
+:20.10-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
 initrd ${kernel_url}initrd