From 8529cc0f27069a458d43a3354bb8d543536c7465 Mon Sep 17 00:00:00 2001 From: Chris Murray Date: Sat, 4 May 2024 03:03:20 +0100 Subject: [PATCH 1/3] remove lunar --- roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 b/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 index d3e536a7..449f8fca 100644 --- a/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 @@ -8,7 +8,6 @@ menu ${os} item --gap ${os} Versions item noble ${space} ${os} 24.04 item mantic ${space} ${os} 23.10 -item lunar ${space} ${os} 23.04 item jammy ${space} ${os} 22.04 item focal ${space} ${os} 20.04 item bionic ${space} ${os} 18.04 @@ -33,14 +32,6 @@ item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flav {% endfor %} goto flavor_select -:lunar -{% for key, value in endpoints.items() | sort %} -{% if value.os == "ubuntu" and 'squash' in key and value.version == "23.04" %} -item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title }} -{% endif %} -{% endfor %} -goto flavor_select - :jammy {% for key, value in endpoints.items() | sort %} {% if value.os == "ubuntu" and 'squash' in key and value.version == "22.04" %} @@ -92,7 +83,6 @@ boot :20.04-boot :22.04-boot -:23.04-boot :23.10-boot :24.04-boot imgfree From 5cb2f2ab8d4fde28229eeea77f72faa2d315185e Mon Sep 17 00:00:00 2001 From: Chris Murray Date: Sat, 4 May 2024 03:03:35 +0100 Subject: [PATCH 2/3] remove xenial --- roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 index 1347d564..b34c1cdb 100644 --- a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 @@ -26,7 +26,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} bionic && set install_type deb || -iseq ${ubuntu_version} xenial && set install_type deb || iseq ${ubuntu_version} focal-legacy && set install_type deb || iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal || iseq ${install_type} sub && goto boot_type || From 4480b13de20dea4f36670fc131a3f2d5cadc5777 Mon Sep 17 00:00:00 2001 From: Chris Murray Date: Sat, 4 May 2024 03:09:15 +0100 Subject: [PATCH 3/3] remove bionic --- endpoints.yml | 63 ------------------- .../templates/menu/live-ubuntu.ipxe.j2 | 15 ----- .../netbootxyz/templates/menu/ubuntu.ipxe.j2 | 1 - 3 files changed, 79 deletions(-) diff --git a/endpoints.yml b/endpoints.yml index f732b21d..8ec2ebb3 100644 --- a/endpoints.yml +++ b/endpoints.yml @@ -1,19 +1,4 @@ endpoints: - ubuntu-18.04-live-kernel: - path: /ubuntu-core-18.04/releases/download/18.04.5-a39e0666/ - files: - - initrd - - vmlinuz - os: ubuntu - version: '18.04' - ubuntu-18.04-default-squash: - path: /ubuntu-squash/releases/download/18.04.5-0dd1e29b/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: GNOME - kernel: ubuntu-18.04-live-kernel debian-10-live-kernel: path: /debian-core-10/releases/download/10.13.0-960f6051/ files: @@ -29,46 +14,6 @@ endpoints: version: '10' flavor: core kernel: debian-10-live-kernel - ubuntu-18.04-xfce-squash: - path: /ubuntu-squash/releases/download/18.04.5-68015e19/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: xfce - kernel: ubuntu-18.04-live-kernel - ubuntu-18.04-KDE-squash: - path: /ubuntu-squash/releases/download/18.04.5-e437f9b4/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: KDE - kernel: ubuntu-18.04-live-kernel - ubuntu-18.04-Budgie-squash: - path: /ubuntu-squash/releases/download/18.04.5-b71b6d21/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: Budgie - kernel: ubuntu-18.04-live-kernel - ubuntu-18.04-MATE-squash: - path: /ubuntu-squash/releases/download/18.04.5-37d2b206/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: MATE - kernel: ubuntu-18.04-live-kernel - ubuntu-18.04-kylin-squash: - path: /ubuntu-squash/releases/download/18.04.5-767cda31/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: kylin - kernel: ubuntu-18.04-live-kernel debian-10-xfce-squash: path: /debian-squash/releases/download/10.10.0-e94fae4e/ files: @@ -1407,14 +1352,6 @@ endpoints: os: elementary-os version: '7' kernel: elementaryos-7-default-squash - ubuntu-18.04-LXQT-squash: - path: /ubuntu-squash/releases/download/18.04.5-224877b3/ - files: - - filesystem.squashfs - os: ubuntu - version: '18.04' - flavor: LXQT - kernel: ubuntu-18.04-live-kernel ubuntu-20.04-LXQT-squash: path: /ubuntu-squash/releases/download/20.04.5-95f04bf8/ files: diff --git a/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 b/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 index 449f8fca..f5524a73 100644 --- a/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2 @@ -10,7 +10,6 @@ item noble ${space} ${os} 24.04 item mantic ${space} ${os} 23.10 item jammy ${space} ${os} 22.04 item focal ${space} ${os} 20.04 -item bionic ${space} ${os} 18.04 choose live_version || goto live_exit menu ${os} ${live_version} item --gap ${os} Flavors @@ -48,14 +47,6 @@ item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flav {% endfor %} 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 }} -{% endif %} -{% endfor %} -goto flavor_select - :flavor_select choose flavor || goto live_menu echo ${cls} @@ -75,12 +66,6 @@ goto {{ value.version }}-boot {% endif %} {% endfor %} -:18.04-boot -imgfree -kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }} -initrd ${kernel_url}initrd -boot - :20.04-boot :22.04-boot :23.10-boot diff --git a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 index b34c1cdb..a4fa24a6 100644 --- a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 @@ -25,7 +25,6 @@ item --gap Older Releases item older_release ${space} Set release codename... choose ubuntu_version || goto ubuntu_exit iseq ${ubuntu_version} older_release && goto older_release || -iseq ${ubuntu_version} bionic && set install_type deb || iseq ${ubuntu_version} focal-legacy && set install_type deb || iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal || iseq ${install_type} sub && goto boot_type ||