Sfoglia il codice sorgente

Merge pull request #762 from netbootxyz/fedora_live_gen

Makes Fedora Live menu more dynamic
Antony Messerli 4 anni fa
parent
commit
d07bd32605

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

@@ -199,12 +199,12 @@ releases:
     mirror: http://download.fedoraproject.org
     name: Fedora
     versions:
-    - code_name: '33'
-      name: '33'
-    - code_name: '32'
-      name: '32'
-    - code_name: '31'
-      name: '31'
+    - code_name: 33
+      name: 33
+    - code_name: 32
+      name: 32
+    - code_name: 31
+      name: 31
   flatcar:
     enabled: true
     menu: linux

+ 8 - 21
roles/netbootxyz/templates/menu/live-fedora.ipxe.j2

@@ -10,37 +10,24 @@ set os Fedora Live
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
-item 33 ${space} ${os} 33
-item 32 ${space} ${os} 32
-item 31 ${space} ${os} 31
+{% for item in releases.fedora.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endfor %}
 choose live_version || goto live_exit
 menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
-:33
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "fedora" and value.version == 33 %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
-{% endif %}
-{% endfor %}
-goto flavor_select
-
-:32
+{% for item in releases.fedora.versions %}
+{% set version_number = item.code_name %}
+:{{ version_number }}
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "fedora" and value.version == 32 %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% if value.os == "fedora" and value.version == version_number %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }}
 {% endif %}
 {% endfor %}
 goto flavor_select
-
-:31
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "fedora" and value.version == 31 %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
-{% endif %}
 {% endfor %}
-goto flavor_select
 
 :flavor_select
 choose flavor || goto live_menu