From b9caec33ce62fe5fdc119fb3c6fda0c9ac5dc3b1 Mon Sep 17 00:00:00 2001
From: Antony Messerli <antony@mes.ser.li>
Date: Fri, 9 Aug 2024 00:30:47 -0500
Subject: [PATCH] Update mint menus

---
 endpoints.yml                                 |  9 ------
 .../templates/menu/live-mint.ipxe.j2          | 30 +++++++++----------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/endpoints.yml b/endpoints.yml
index 070876cd..3ddaac74 100644
--- a/endpoints.yml
+++ b/endpoints.yml
@@ -1657,15 +1657,6 @@ endpoints:
     - supergrub2-classic-x86_64.efi
     os: supergrubdisk
     version: 2.06s4
-  mint-xfce-squash:
-    path: /ubuntu-squash/releases/download/22-eddd71a2/
-    files:
-    - initrd
-    - vmlinuz
-    - filesystem.squashfs
-    os: mint
-    version: '22'
-    flavor: xfce
   mint-22-xfce-squash:
     path: /ubuntu-squash/releases/download/22-42f238bf/
     files:
diff --git a/roles/netbootxyz/templates/menu/live-mint.ipxe.j2 b/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
index 45d8e392..797b082d 100644
--- a/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
@@ -6,15 +6,23 @@ goto ${menu} ||
 set os Mint Live
 menu ${os}
 item --gap ${os} Versions
+item 22 ${space} ${os} 22
 item 21 ${space} ${os} 21
 item 20 ${space} ${os} 20
-item 19 ${space} ${os} 19
 item lmde ${space} ${os} LMDE
 choose live_version || goto live_exit
 menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:22
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "mint" and 'squash' in key and '22' in value.version %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :21
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "mint" and 'squash' in key and '21' in value.version %}
@@ -31,14 +39,6 @@ item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flav
 {% endfor %}
 goto flavor_select
 
-:19
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and '19' in value.version %}
-item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
-{% endif %}
-{% endfor %}
-goto flavor_select
-
 :lmde
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "mint" and 'squash' in key and value.version == "lmde" %}
@@ -70,6 +70,12 @@ goto {{ value.version | int }}-boot
 {% endif %}
 {% endfor %}
 
+:22-boot
+imgfree
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
+initrd ${kernel_url}initrd
+boot
+
 :21-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
@@ -82,12 +88,6 @@ kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{
 initrd ${kernel_url}initrd
 boot
 
-:19-boot
-imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
-initrd ${kernel_url}initrd
-boot
-
 :lmde-boot
 imgfree
 kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}