Merge branch 'netbootxyz:development' into development

novaTopFlex · Apr 3, 2024 · 35ab303 · 35ab303
2 parents 1b700bb + 515d77d
commit 35ab303
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [2.0.78] - 2024-00-00
+## [2.0.79] - 2024-00-00
+
+## [2.0.78] - 2024-03-30
+
+### Fixed
+
+- Resolves an issue with the generated index having incorrect naming on the links due
+  to a previous variable name change on the index template
+- Proxmox iso names are corrected for backup and mailgateway
 
 ## [2.0.77] - 2024-02-24
 

diff --git a/endpoints.yml b/endpoints.yml
@@ -38,15 +38,15 @@ endpoints:
     flavor: xfce
     kernel: ubuntu-18.04-live-kernel
   ubuntu-18.04-KDE-squash:
-    path: /ubuntu-squash/releases/download/18.04.5-6a909f1e/
+    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-be9dd330/
+    path: /ubuntu-squash/releases/download/18.04.5-b71b6d21/
     files:
     - filesystem.squashfs
     os: ubuntu
@@ -136,13 +136,13 @@ endpoints:
     flavor: xfce
     kernel: kali-xfce-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20240320-1805-9b372e2a/
+    path: /ubuntu-squash/releases/download/20240321-0715-9b372e2a/
     files:
     - vmlinuz
     - filesystem.squashfs
     - initrd.lz
     os: neon
-    version: 20240320-1805
+    version: 20240321-0715
     flavor: user
     kernel: kde-neon-user
   regolith-current:
@@ -174,7 +174,7 @@ endpoints:
     version: '15'
     kernel: deepin-15-squash
   feren-squash:
-    path: /ubuntu-squash/releases/download/2023.01-1d46b944/
+    path: /ubuntu-squash/releases/download/2023.01-2aadd48c/
     files:
     - filesystem.squashfs
     - initrd
@@ -326,7 +326,7 @@ endpoints:
     os: gparted
     version: stable
   rescatux:
-    path: /debian-squash/releases/download/0.72-beta8-2db92971/
+    path: /debian-squash/releases/download/0.72-beta8-55ca0efd/
     files:
     - filesystem.squashfs
     - initrd
@@ -398,7 +398,7 @@ endpoints:
     os: kaspersky
     version: '18'
   septor:
-    path: /debian-squash/releases/download/2022-12265673/
+    path: /debian-squash/releases/download/2022-4bfba007/
     files:
     - filesystem.squashfs
     - initrd
@@ -445,7 +445,7 @@ endpoints:
     flavor: kde
     kernel: manjaro-kde-current
   fatdog:
-    path: /asset-mirror/releases/download/901-28d54d00/
+    path: /asset-mirror/releases/download/901-ddcb82ff/
     files:
     - vmlinuz
     - initrd
@@ -607,7 +607,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/1.5-rolling-202403220018-0956eeaa/
+    path: /debian-squash/releases/download/1.5-rolling-202403250019-0956eeaa/
     files:
     - filesystem.squashfs
     - initrd
@@ -812,22 +812,22 @@ endpoints:
     os: memtest86-free
     version: '10.7'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20231106T160201Z-5b773f72/
+    path: /asset-mirror/releases/download/20240129T170346Z-5b773f72/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20231106T160201Z
+    version: 20240129T170346Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20231105T230202Z-d5972d15/
+    path: /asset-mirror/releases/download/20240310T233344Z-d5972d15/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20231105T230202Z
+    version: 20240310T233344Z
     arch: arm64
   gentoo-amd64:
     path: /asset-mirror/releases/download/20231126T163200Z-63d6ec39/
@@ -839,14 +839,15 @@ endpoints:
     version: 20231126T163200Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/6.0-cfd50f75/
+    path: /asset-mirror/releases/download/6.1-cfd50f75/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     - tails-amd64-6.0.iso
+    - tails-amd64-6.1.iso
     os: tails
-    version: '6.0'
+    version: '6.1'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20231124-1008bb6d/
@@ -977,13 +978,13 @@ endpoints:
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20240319-noble-c67d897c/
+    path: /ubuntu-squash/releases/download/20240327-noble-c67d897c/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20240319-noble
+    version: 20240327-noble
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
@@ -1142,7 +1143,7 @@ endpoints:
     flavor: kde-barebones
     version: 220329
   proxmox-backup-server:
-    path: /asset-mirror/releases/download/3.1-1-e7504e47/
+    path: /asset-mirror/releases/download/3.1-1-01e6c736/
     files:
     - initrd
     - proxmox-backup-server.iso
@@ -1388,7 +1389,7 @@ endpoints:
     os: xcp-ng
     version: '8.2'
   garuda-cinnamon:
-    path: /asset-mirror/releases/download/231029-7f0fd76e/
+    path: /asset-mirror/releases/download/231029-0b360492/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1541,7 +1542,7 @@ endpoints:
     flavor: cinnamon
     kernel: debian-12-live-kernel
   debian-12-lxqt-squash:
-    path: /debian-squash/releases/download/12.5.0-c387dd82/
+    path: /debian-squash/releases/download/12.5.0-43f2cd09/
     files:
     - filesystem.squashfs
     os: debian

diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml
@@ -158,8 +158,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2024.03.01
-      name: 2024.03.01
+    - code_name: 2024.04.01
+      name: 2024.04.01
   blackarch:
     enabled: true
     menu: linux
@@ -191,11 +191,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 39.20240225.3.0
+    - code_name: 39.20240309.3.0
       name: stable
-    - code_name: 39.20240309.2.0
+    - code_name: 39.20240322.2.0
       name: testing
-    - code_name: 39.20240309.1.0
+    - code_name: 40.20240331.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -289,8 +289,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.29-core183
-      name: 2.29 Core183
+    - code_name: 2.29-core184
+      name: 2.29 Core184
   k3os:
     enabled: true
     menu: linux
@@ -458,14 +458,14 @@ releases:
     mirror: https://netboot.smartos.org/os/
     name: SmartOS
     versions:
+    - code_name: 20240321T001600Z
+      name: 20240321T001600Z
     - code_name: 20240307T000552Z
       name: 20240307T000552Z
     - code_name: 20240222T001232Z
       name: 20240222T001232Z
     - code_name: 20240208T000334Z
       name: 20240208T000334Z
-    - code_name: 20240125T000404Z
-      name: 20240125T000404Z
   talos:
     enabled: true
     menu: linux

diff --git a/roles/netbootxyz/tasks/generate_checksums.yml b/roles/netbootxyz/tasks/generate_checksums.yml
@@ -25,6 +25,10 @@
   register: index_title
   when: ansible_os_family == "Debian"
 
+- name: Reset bootloader filename to first in list
+  ansible.builtin.set_fact:
+    bootloader_filename: "{{ bootloader_disks | first }}"
+
 - name: Generate netboot.xyz index template
   ansible.builtin.template:
     src: index.html.j2

diff --git a/roles/netbootxyz/templates/menu/proxmox.ipxe.j2 b/roles/netbootxyz/templates/menu/proxmox.ipxe.j2
@@ -79,7 +79,7 @@ set proxmox_version {{ value.version }}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd ${kernel_url}proxmox-backup-server.iso /proxmox.iso
+initrd ${kernel_url}proxmox.iso /proxmox.iso
 boot
 
 :boot-pmg
@@ -92,7 +92,7 @@ set proxmox_version {{ value.version }}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd ${kernel_url}proxmox-mailgateway.iso /proxmox.iso
+initrd ${kernel_url}proxmox.iso /proxmox.iso
 boot
 
 :boot-pve

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.0.78
+2.0.79