Prechádzať zdrojové kódy

Merge pull request #1577 from netbootxyz/RC

Release 2.0.85
Antony Messerli 2 mesiacov pred
rodič
commit
6db86689f6

+ 11 - 6
CHANGELOG.md

@@ -3,18 +3,23 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [2.0.85] - 2025-02-23
+
+### Changed
+
+- Various version updates
+- Checks for boot timeout from local-vars.ipxe
 
 ## [2.0.84] - 2025-01-04
 
-## Added
+### Added
 
 - UEFI Shell available under utilities for x86/ARM UEFI mode
 - Floppy boot images for UEFI
 - Dasharo Tools Suite
 - Latest GRML added with ARM support
 
-## Changed
+### Changed
 
 - Moves win_base_url and rhel_base_url out of boot.cfg to local-vars.ipxe as they are
   user defined variables.
@@ -23,19 +28,19 @@ All notable changes to this project will be documented in this file.
 
 ## [2.0.83] - 2024-11-07
 
-## Changed
+### Changed
 
 - Various version updates
 
 ## [2.0.82] - 2024-09-18
 
-## Changed
+### Changed
 
 - Various version updates
 
 ## [2.0.81] - 2024-08-10
 
-## Added
+### Added
 
 - Added ZFSBootMenu
 - Added VanillaOS

+ 51 - 54
endpoints.yml

@@ -81,13 +81,13 @@ endpoints:
     flavor: xfce
     kernel: kali-xfce-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20241229-0747-9b372e2a/
+    path: /ubuntu-squash/releases/download/20250202-0745-9b372e2a/
     files:
     - vmlinuz
     - filesystem.squashfs
     - initrd.lz
     os: neon
-    version: 20241229-0747
+    version: 20250202-0745
     flavor: user
     kernel: kde-neon-user
   regolith-current:
@@ -150,7 +150,7 @@ endpoints:
     os: dban
     version: 2.3.0
   sparky-stable-mingui:
-    path: /debian-squash/releases/download/7.5-6c87e83c/
+    path: /debian-squash/releases/download/7.6-6c87e83c/
     files:
     - filesystem.squashfs
     - initrd
@@ -160,7 +160,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-stable-mingui
   sparky-stable-gui:
-    path: /debian-squash/releases/download/7.5-d38c17d0/
+    path: /debian-squash/releases/download/7.6-d38c17d0/
     files:
     - filesystem.squashfs
     - initrd
@@ -170,7 +170,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-stable-gui
   sparky-stable-lxqt:
-    path: /debian-squash/releases/download/7.5-f9c9e1f1/
+    path: /debian-squash/releases/download/7.6-f9c9e1f1/
     files:
     - filesystem.squashfs
     - initrd
@@ -210,7 +210,7 @@ endpoints:
     flavor: lxqt
     kernel: sparky-rolling-lxqt
   oracle-8:
-    path: /asset-mirror/releases/download/6-853a47d3/
+    path: /asset-mirror/releases/download/6-1525fd25/
     files:
     - vmlinuz
     - initrd
@@ -218,15 +218,6 @@ endpoints:
     os: oracle
     version: '8'
     arch: x86_64
-  oracle-7:
-    path: /asset-mirror/releases/download/u9-41493433/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: oracle
-    version: '7'
-    arch: x86_64
   kodachi-6:
     path: /ubuntu-squash/releases/download/6.2-2a23039c/
     files:
@@ -245,7 +236,7 @@ endpoints:
     version: '2'
     flavor: ascii
   gparted-stable:
-    path: /debian-squash/releases/download/1.6.0-10-cff72999/
+    path: /debian-squash/releases/download/1.7.0-1-cff72999/
     files:
     - filesystem.squashfs
     - initrd
@@ -386,7 +377,7 @@ endpoints:
     os: fatdog
     version: current
   raizo:
-    path: /debian-squash/releases/download/v15.24.10.01i-cdb1c06f/
+    path: /debian-squash/releases/download/v16.25.01.25i-cdb1c06f/
     files:
     - filesystem.squashfs
     - initrd
@@ -541,7 +532,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/1.5-rolling-202408160021-0956eeaa/
+    path: /debian-squash/releases/download/1.5-rolling-202502190007-0d0f700e/
     files:
     - filesystem.squashfs
     - initrd
@@ -740,47 +731,47 @@ endpoints:
     flavor: bullseye
     kernel: voyager-bullseye-squash
   memtest86:
-    path: /asset-mirror/releases/download/11.1-2ae1d21b/
+    path: /asset-mirror/releases/download/11.2-2ae1d21b/
     files:
     - memtest86-usb.img
     os: memtest86-free
-    version: '11.1'
+    version: '11.2'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20241118T170330Z-5b773f72/
+    path: /asset-mirror/releases/download/20241209T170323Z-5b773f72/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20241118T170330Z
+    version: 20241209T170323Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20241117T233317Z-d5972d15/
+    path: /asset-mirror/releases/download/20250119T234827Z-d5972d15/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20241117T233317Z
+    version: 20250119T234827Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20241213T133324Z-63d6ec39/
+    path: /asset-mirror/releases/download/20250115T221822Z-63d6ec39/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20241213T133324Z
+    version: 20250115T221822Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/6.10-911e1aab/
+    path: /asset-mirror/releases/download/6.12-911e1aab/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     - tails-amd64.iso
     os: tails
-    version: '6.10'
+    version: '6.12'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20231124-1008bb6d/
@@ -838,11 +829,11 @@ endpoints:
     version: 0.34_32-bit_20221231
     arch: i686
   shredos-x86_64:
-    path: /asset-mirror/releases/download/2024.02.2_26.0_x86-64_0.37-bd59ed1f/
+    path: /asset-mirror/releases/download/2024.11_27_x86-64_0.38-fa89876c/
     files:
     - shredos
     os: shredos
-    version: 2024.02.2_26.0_x86-64_0.37
+    version: 2024.11_27_x86-64_0.38
     arch: x86_64
   archlinux-32:
     path: /asset-mirror/releases/download/2024.07.10-1d684723/
@@ -887,13 +878,13 @@ endpoints:
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.2.0-29-9e73bfe5/
+    path: /debian-squash/releases/download/3.2.1-7-9e73bfe5/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.2.0-29
+    version: 3.2.1-7
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
@@ -909,13 +900,13 @@ endpoints:
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20241225-plucky-c67d897c/
+    path: /ubuntu-squash/releases/download/20250218-plucky-c67d897c/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20241225-plucky
+    version: 20250218-plucky
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
@@ -1225,7 +1216,7 @@ endpoints:
     version: '4.0'
     arch: aarch64
   harvester:
-    path: /asset-mirror/releases/download/v1.4.0-c82c6d22/
+    path: /asset-mirror/releases/download/v1.4.1-c82c6d22/
     files:
     - harvester-vmlinuz-amd64
     - harvester-initrd-amd64
@@ -1233,7 +1224,7 @@ endpoints:
     - harvester-amd64.sha512
     - version.yaml
     os: harvester
-    version: v1.4.0
+    version: v1.4.1
   linux-lite-6-squash:
     path: /ubuntu-squash/releases/download/6.4-2550834c/
     files:
@@ -1292,22 +1283,22 @@ endpoints:
     version: '9'
     arch: aarch64
   parrot-home:
-    path: /debian-squash/releases/download/6.2-897b335c/
+    path: /debian-squash/releases/download/6.3.2-37ae0f27/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: parrot
-    version: '6.2'
+    version: 6.3.2
     flavor: home
   parrot-security:
-    path: /debian-squash/releases/download/6.2-6288c350/
+    path: /debian-squash/releases/download/6.3.2-999ed7ad/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: parrot
-    version: '6.2'
+    version: 6.3.2
     flavor: security
   xcp-ng:
     path: /asset-mirror/releases/download/8.2-55521b28/
@@ -1358,7 +1349,7 @@ endpoints:
     os: debian
     version: '12'
   debian-12-default-squash:
-    path: /debian-squash/releases/download/12.8.0-b545a82c/
+    path: /debian-squash/releases/download/12.9.0-b545a82c/
     files:
     - filesystem.squashfs
     os: debian
@@ -1366,7 +1357,7 @@ endpoints:
     flavor: core
     kernel: debian-12-live-kernel
   debian-12-gnome-squash:
-    path: /debian-squash/releases/download/12.8.0-d2c07a8a/
+    path: /debian-squash/releases/download/12.9.0-d2c07a8a/
     files:
     - filesystem.squashfs
     os: debian
@@ -1374,7 +1365,7 @@ endpoints:
     flavor: gnome
     kernel: debian-12-live-kernel
   debian-12-cinnamon-squash:
-    path: /debian-squash/releases/download/12.8.0-c84a8c03/
+    path: /debian-squash/releases/download/12.9.0-c84a8c03/
     files:
     - filesystem.squashfs
     os: debian
@@ -1382,7 +1373,7 @@ endpoints:
     flavor: cinnamon
     kernel: debian-12-live-kernel
   debian-12-lxqt-squash:
-    path: /debian-squash/releases/download/12.8.0-43f2cd09/
+    path: /debian-squash/releases/download/12.9.0-43f2cd09/
     files:
     - filesystem.squashfs
     os: debian
@@ -1390,7 +1381,7 @@ endpoints:
     flavor: lxqt
     kernel: debian-12-live-kernel
   debian-12-mate-squash:
-    path: /debian-squash/releases/download/12.8.0-1a8949e5/
+    path: /debian-squash/releases/download/12.9.0-1a8949e5/
     files:
     - filesystem.squashfs
     os: debian
@@ -1398,7 +1389,7 @@ endpoints:
     flavor: mate
     kernel: debian-12-live-kernel
   debian-12-lxde-squash:
-    path: /debian-squash/releases/download/12.8.0-b3449bd8/
+    path: /debian-squash/releases/download/12.9.0-b3449bd8/
     files:
     - filesystem.squashfs
     os: debian
@@ -1406,7 +1397,7 @@ endpoints:
     flavor: lxde
     kernel: debian-12-live-kernel
   debian-12-xfce-squash:
-    path: /debian-squash/releases/download/12.8.0-40a848cc/
+    path: /debian-squash/releases/download/12.9.0-40a848cc/
     files:
     - filesystem.squashfs
     os: debian
@@ -1414,7 +1405,7 @@ endpoints:
     flavor: xfce
     kernel: debian-12-live-kernel
   debian-12-kde-squash:
-    path: /debian-squash/releases/download/12.8.0-90c96885/
+    path: /debian-squash/releases/download/12.9.0-90c96885/
     files:
     - filesystem.squashfs
     os: debian
@@ -1585,23 +1576,23 @@ endpoints:
     os: memtest86-plus
     version: '7.20'
   ubuntu-netboot-24.04-arm64:
-    path: /ubuntu-squash/releases/download/24.04.1-7b71a472/
+    path: /ubuntu-squash/releases/download/24.04.2-7b71a472/
     files:
     - initrd
     - vmlinuz
     os: ubuntu
-    version: 24.04.1
+    version: 24.04.2
     codename: noble
     flavor: netboot
     kernel: ubuntu-netboot-24.04-arm64
     arch: arm64
   ubuntu-netboot-24.04-amd64:
-    path: /ubuntu-squash/releases/download/24.04.1-dac09526/
+    path: /ubuntu-squash/releases/download/24.04.2-dac09526/
     files:
     - initrd
     - vmlinuz
     os: ubuntu
-    version: 24.04.1
+    version: 24.04.2
     codename: noble
     flavor: netboot
     kernel: ubuntu-netboot-24.04-amd64
@@ -1634,11 +1625,11 @@ endpoints:
     os: vanilla-os
     version: 2-20240728
   zfsbootmenu:
-    path: /asset-mirror/releases/download/2.3.0-43c730d4/
+    path: /asset-mirror/releases/download/3.0.1-bfc4188e/
     files:
     - zfsbootmenu-recovery-x86_64.efi
     os: zfsbootmenu
-    version: 2.3.0
+    version: 3.0.1
   supergrubdisk:
     path: /asset-mirror/releases/download/2.06s4-b7b838c6/
     files:
@@ -1745,3 +1736,9 @@ endpoints:
     - uefi-shell-arm.efi
     os: uefi-shell
     version: edk2-stable202002
+  uefi-shell-x64:
+    path: /asset-mirror/releases/download/edk2-stable202002-4c8abfeb/
+    files:
+    - uefi-shell-x64.efi
+    os: uefi-shell-x64
+    version: edk2-stable202002

+ 48 - 56
roles/netbootxyz/defaults/main.yml

@@ -166,8 +166,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2025.01.01
-      name: 2025.01.01
+    - code_name: 2025.02.01
+      name: 2025.02.01
   blackarch:
     enabled: true
     menu: linux
@@ -176,20 +176,16 @@ releases:
     - code_name: current
       name: current
   centos:
-    base_dir: centos
+    base_dir: null
     enabled: true
     menu: linux
-    mirror: http://mirror.centos.org
-    name: CentOS
+    mirror: https://mirror.stream.centos.org
+    name: CentOS Stream
     versions:
+    - code_name: 10-stream
+      name: 10.0 Stream
     - code_name: 9-stream
       name: 9.0 Stream
-    - code_name: 8.5.2111
-      name: '8.5'
-    - code_name: 8
-      name: 8.x Latest
-    - code_name: 8-stream
-      name: 8.0 Stream
   coreos:
     base_dir: prod/streams
     enabled: true
@@ -197,11 +193,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 41.20241122.3.0
+    - code_name: 41.20250130.3.0
       name: stable
-    - code_name: 41.20241215.2.0
+    - code_name: 41.20250215.2.0
       name: testing
-    - code_name: 41.20241215.1.0
+    - code_name: 41.20250215.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -295,8 +291,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.29-core190
-      name: 2.29 Core190
+    - code_name: 2.29-core191
+      name: 2.29 Core191
   k3os:
     enabled: true
     menu: linux
@@ -328,26 +324,24 @@ releases:
     menu: linux
     name: NixOS
     versions:
-    - code_name: nixos-20.09
-      name: nixos-20.09
-    - code_name: nixos-21.05
-      name: nixos-21.05
-    - code_name: nixos-21.11
-      name: nixos-21.11
-    - code_name: nixos-22.05
-      name: nixos-22.05
-    - code_name: nixos-22.11
-      name: nixos-22.11
-    - code_name: nixos-23.05
-      name: nixos-23.05
-    - code_name: nixos-23.11
-      name: nixos-23.11
-    - code_name: nixos-24.05
-      name: nixos-24.05
     - code_name: nixos-24.11
       name: nixos-24.11
-    - code_name: nixos-unstable
-      name: nixos-unstable
+    - code_name: nixos-24.05
+      name: nixos-24.05
+    - code_name: nixos-23.11
+      name: nixos-23.11
+    - code_name: nixos-23.05
+      name: nixos-23.05
+    - code_name: nixos-22.11
+      name: nixos-22.11
+    - code_name: nixos-22.05
+      name: nixos-22.05
+    - code_name: nixos-21.11
+      name: nixos-21.11
+    - code_name: nixos-21.05
+      name: nixos-21.05
+    - code_name: nixos-20.09
+      name: nixos-20.09
   openEuler:
     base_dir: null
     enabled: true
@@ -355,8 +349,10 @@ releases:
     mirror: http://repo.openeuler.org
     name: openEuler
     versions:
-    - code_name: openEuler-23.09
-      name: openEuler-23.09
+    - code_name: openEuler-24.09
+      name: openEuler-24.09
+    - code_name: openEuler-24.03-LTS-SP1
+      name: openEuler-24.03-LTS-SP1
     - code_name: openEuler-20.03-LTS-SP3
       name: openEuler-20.03-LTS-SP3
     - code_name: openEuler-22.03-LTS
@@ -372,18 +368,15 @@ releases:
     mirror: http://ftp.openbsd.org
     name: OpenBSD
     versions:
-    - code_name: '7.4'
-      image_ver: '74'
-      name: '7.4'
-    - code_name: '7.3'
-      image_ver: '73'
-      name: '7.3'
-    - code_name: '7.2'
-      image_ver: '72'
-      name: '7.2'
+    - code_name: '7.6'
+      image_ver: '76'
+      name: '7.6'
+    - code_name: '7.5'
+      image_ver: '75'
+      name: '7.5'
     - code_name: snapshots
-      image_ver: '74'
-      name: 7.4 Latest Snapshot
+      image_ver: '76'
+      name: 7.6 Latest Snapshot
   opensuse:
     base_dir: distribution/leap
     enabled: true
@@ -403,7 +396,6 @@ releases:
     mirror: https://yum.oracle.com
     name: Oracle Linux
     paths:
-      7: /repo/OracleLinux/OL7/latest
       8: /repo/OracleLinux/OL8/baseos/latest
       9: /repo/OracleLinux/OL9/baseos/latest
   photon:
@@ -451,14 +443,14 @@ releases:
     mirror: https://netboot.smartos.org/os/
     name: SmartOS
     versions:
-    - code_name: 20241226T000807Z
-      name: 20241226T000807Z
-    - code_name: 20241212T000748Z
-      name: 20241212T000748Z
-    - code_name: 20241128T004404Z
-      name: 20241128T004404Z
-    - code_name: 20241114T000536Z
-      name: 20241114T000536Z
+    - code_name: 20250220T074131Z
+      name: 20250220T074131Z
+    - code_name: 20250220T000340Z
+      name: 20250220T000340Z
+    - code_name: 20250206T001102Z
+      name: 20250206T001102Z
+    - code_name: 20250124T134639Z
+      name: 20250124T134639Z
   talos:
     enabled: true
     menu: linux

+ 3 - 0
roles/netbootxyz/templates/local-vars.ipxe.j2

@@ -15,3 +15,6 @@
 
 ### Sets the local live endpoint for the users local installation
 #set live_endpoint http://my_ip_address:8080
+
+### Sets the default boot timeout
+#set boot_timeout 300000

+ 1 - 1
roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -23,7 +23,7 @@ set sigs {{ sigs_location }}
 iseq ${platform} efi && set ipxe_disk netboot.xyz-snponly.efi || set ipxe_disk netboot.xyz-undionly.kpxe
 
 # set default boot timeout
-set boot_timeout {{ boot_timeout }}
+isset ${boot_timeout} || set boot_timeout {{ boot_timeout }}
 
 ##################
 # official mirrors

+ 2 - 6
roles/netbootxyz/templates/menu/centos.ipxe.j2

@@ -1,6 +1,6 @@
 #!ipxe
 
-# CentOS Operating System
+# CentOS Stream
 # http://www.centos.org
 
 isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
@@ -20,8 +20,7 @@ item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
 isset ${osversion} || choose osversion || goto linux_menu
 echo ${cls}
-iseq ${os_arch} x86_64 && set dir ${centos_base_dir}/${osversion}/BaseOS/${os_arch}/os ||
-iseq ${os_arch} aarch64 && set dir altarch/${osversion}/BaseOS/${os_arch}/os ||
+set dir ${centos_base_dir}/${osversion}/BaseOS/${os_arch}/os ||
 set repo ${centos_mirror}/${dir}
 goto boottype
 
@@ -60,9 +59,6 @@ goto boottype
 
 :bootos_images
 imgfree
-iseq ${osversion} 9-stream && set centos_mirror http://mirror.rackspace.com/centos-stream ||
-iseq ${osversion} 9-stream && set dir ${osversion}/BaseOS/${os_arch}/os ||
-iseq ${osversion} 9-stream && set repo ${centos_mirror}/${dir} ||
 kernel ${centos_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${centos_mirror}/${dir}/images/pxeboot/initrd.img
 echo

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.84
+2.0.85