Преглед на файлове

Merge pull request #1287 from netbootxyz/RC

Release 2.0.71
Antony Messerli преди 1 година
родител
ревизия
8c6406cdc7

+ 1 - 1
.github/workflows/development.yml

@@ -18,7 +18,7 @@ jobs:
       id-token: write
       contents: read
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Retrieve Certs
       run: |

+ 2 - 2
.github/workflows/pull-requests.yml

@@ -12,7 +12,7 @@ jobs:
     name: Test Pull Request
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: actions/setup-python@v4
       with:
@@ -35,7 +35,7 @@ jobs:
     name: Build Pull Request
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: actions/setup-python@v4
 

+ 1 - 1
.github/workflows/release-candidate.yml

@@ -18,7 +18,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Retrieve Certs
       run: |

+ 1 - 1
.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Retrieve Certs
       run: |

+ 1 - 1
.github/workflows/rolling.yml

@@ -20,7 +20,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: 'master'
 

+ 16 - 1
CHANGELOG.md

@@ -5,7 +5,22 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [2.0.70] - 2023-00-00
+## [2.0.71] - 2023-09-09
+
+### Added
+
+- Added NixOS option for ARM
+
+### Changed
+
+- Adjusted bootloader logic for detecting v6 and v6 scenarios
+
+### Fixed
+
+- Kickstart URLs were broken on RHEL based distros if text install
+  was being used.
+
+## [2.0.70] - 2023-07-03
 
 ### Added
 

+ 1 - 1
README.md

@@ -161,7 +161,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | NixOS | https://nixos.org | Yes | No |
 | OpenBSD | https://openbsd.org | Yes | No |
 | openEuler | https://openeuler.org | Yes | No |
-| OpenSUSE | https://opensuse.org | Yes | No |
+| openSUSE | https://opensuse.org | Yes | No |
 | Oracle Linux | https://www.oracle.com/linux/ | Yes | Installer |
 | Parrot Security | https://www.parrotsec.org | No | Yes |
 | Peppermint | https://peppermintos.com | No | Yes |

+ 70 - 225
endpoints.yml

@@ -133,13 +133,13 @@ endpoints:
     flavor: mate
     kernel: debian-10-live-kernel
   kali-xfce-squash:
-    path: /debian-squash/releases/download/2023.2-aee4a172/
+    path: /debian-squash/releases/download/2023.3-aee4a172/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: kali
-    version: '2023.2'
+    version: '2023.3'
     flavor: xfce
     kernel: kali-xfce-squash
   pop-19.10-default-squash:
@@ -227,13 +227,13 @@ endpoints:
     flavor: default
     kernel: backbox-6-default-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20230629-0719-702c76ea/
+    path: /ubuntu-squash/releases/download/20230907-0716-702c76ea/
     files:
     - vmlinuz
     - filesystem.squashfs
     - initrd.lz
     os: neon
-    version: 20230629-0719
+    version: 20230907-0716
     flavor: user
     kernel: kde-neon-user
   regolith-current:
@@ -351,7 +351,7 @@ endpoints:
     os: dban
     version: 2.3.0
   sparky-stable-mingui:
-    path: /debian-squash/releases/download/7.0-a6d3bdfa/
+    path: /debian-squash/releases/download/7.0.1-a6d3bdfa/
     files:
     - filesystem.squashfs
     - initrd
@@ -361,7 +361,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-stable-mingui
   sparky-stable-gui:
-    path: /debian-squash/releases/download/7.0-60b64dd4/
+    path: /debian-squash/releases/download/7.0.1-60b64dd4/
     files:
     - filesystem.squashfs
     - initrd
@@ -371,7 +371,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-stable-gui
   sparky-stable-lxqt:
-    path: /debian-squash/releases/download/7.0-9084dcac/
+    path: /debian-squash/releases/download/7.0.1-9084dcac/
     files:
     - filesystem.squashfs
     - initrd
@@ -381,7 +381,7 @@ endpoints:
     flavor: lxqt
     kernel: sparky-stable-lxqt
   sparky-rolling-mingui:
-    path: /debian-squash/releases/download/2023.03-f4dfb444/
+    path: /debian-squash/releases/download/2023.07-f4dfb444/
     files:
     - filesystem.squashfs
     - initrd
@@ -391,7 +391,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-rolling-mingui
   sparky-rolling-gui:
-    path: /debian-squash/releases/download/2023.03-c302aff8/
+    path: /debian-squash/releases/download/2023.07-c302aff8/
     files:
     - filesystem.squashfs
     - initrd
@@ -401,7 +401,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-rolling-gui
   sparky-rolling-lxqt:
-    path: /debian-squash/releases/download/2023.03-b10c70d5/
+    path: /debian-squash/releases/download/2023.07-b10c70d5/
     files:
     - filesystem.squashfs
     - initrd
@@ -482,7 +482,7 @@ endpoints:
     version: '2022.11'
     flavor: small
   gparted-stable:
-    path: /debian-squash/releases/download/1.5.0-1-b6cfb563/
+    path: /debian-squash/releases/download/1.5.0-6-b6cfb563/
     files:
     - filesystem.squashfs
     - initrd
@@ -522,7 +522,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/6.3.9-2023.06.23-475894cd/
+    path: /asset-mirror/releases/download/6.4.3-2023.07.17-475894cd/
     files:
     - initrd
     - vmlinuz
@@ -617,7 +617,7 @@ endpoints:
     flavor: kde
     kernel: manjaro-kde-current
   fatdog:
-    path: /asset-mirror/releases/download/813-bf8fccda/
+    path: /asset-mirror/releases/download/814-bf8fccda/
     files:
     - vmlinuz
     - initrd
@@ -632,7 +632,7 @@ endpoints:
     os: raizo
     version: current
   4mlinux:
-    path: /asset-mirror/releases/download/42.0-1e4f619c/
+    path: /asset-mirror/releases/download/43.0-1e4f619c/
     files:
     - initrd
     - vmlinuz
@@ -640,7 +640,7 @@ endpoints:
     version: current
     flavor: full
   4mlinux-thesss:
-    path: /asset-mirror/releases/download/42.0-9ad98d63/
+    path: /asset-mirror/releases/download/43.0-9ad98d63/
     files:
     - initrd
     - vmlinuz
@@ -648,7 +648,7 @@ endpoints:
     version: current
     flavor: TheSSS
   4mlinux-bakandimg:
-    path: /asset-mirror/releases/download/42.0-bd59d834/
+    path: /asset-mirror/releases/download/43.0-bd59d834/
     files:
     - initrd
     - vmlinuz
@@ -789,7 +789,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/202304271626-f77c5f37/
+    path: /debian-squash/releases/download/202308170317-47b5dc66/
     files:
     - filesystem.squashfs
     - initrd
@@ -870,13 +870,13 @@ endpoints:
     os: nitrux
     version: 2022.02.28
   endeavouros:
-    path: /asset-mirror/releases/download/Artemis_nova_22_9-cd1ec3bb/
+    path: /asset-mirror/releases/download/Cassini_Nova-03-2023_R2-36475eee/
     files:
     - airootfs.sfs
     - initrd
     - vmlinuz
     os: endeavouros
-    version: Artemis_nova_22_9
+    version: Cassini_Nova-03-2023_R2
   kodachi-8:
     path: /ubuntu-squash/releases/download/8.2-625e11fa/
     files:
@@ -1066,46 +1066,46 @@ endpoints:
     flavor: bullseye
     kernel: voyager-bullseye-squash
   memtest86:
-    path: /asset-mirror/releases/download/10.5-81ecc10e/
+    path: /asset-mirror/releases/download/10.6-81ecc10e/
     files:
     - memtest86-usb.img
     os: memtest86-free
-    version: '10.5'
+    version: '10.6'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20230619T170202Z-c0630a5f/
+    path: /asset-mirror/releases/download/20230904T163758Z-c0630a5f/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230619T170202Z
+    version: 20230904T163758Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20230625T234657Z-d29572ce/
+    path: /asset-mirror/releases/download/20230903T203159Z-d29572ce/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230625T234657Z
+    version: 20230903T203159Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20230625T165009Z-abe575fe/
+    path: /asset-mirror/releases/download/20230903T170202Z-abe575fe/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230625T165009Z
+    version: 20230903T170202Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/5.14-29645174/
+    path: /asset-mirror/releases/download/5.17-b0a72d72/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     os: tails
-    version: '5.14'
+    version: '5.17'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20230105-b073bf9a/
@@ -1232,35 +1232,35 @@ endpoints:
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.1.1-6-1c3e1967/
+    path: /debian-squash/releases/download/3.1.1-18-1c3e1967/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.1-6
+    version: 3.1.1-18
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
   clonezilla-debian-testing-i686:
-    path: /debian-squash/releases/download/3.1.1-6-d77841f5/
+    path: /debian-squash/releases/download/3.1.1-18-d77841f5/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.1-6
+    version: 3.1.1-18
     flavor: testing
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20230629-mantic-4ef16ee0/
+    path: /ubuntu-squash/releases/download/20230903-mantic-4ef16ee0/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20230629-mantic
+    version: 20230903-mantic
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
@@ -1466,31 +1466,31 @@ endpoints:
     version: 5.0b1
     arch: amd64
   ubuntu-netboot-22.04-amd64:
-    path: /ubuntu-squash/releases/download/22.04.2-7d91a596/
+    path: /ubuntu-squash/releases/download/22.04.3-7d91a596/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: ubuntu
-    version: 22.04.2
+    version: 22.04.3
     codename: jammy
     flavor: netboot
     kernel: ubuntu-netboot-22.04-amd64
     arch: amd64
   ubuntu-netboot-22.04-arm64:
-    path: /ubuntu-squash/releases/download/22.04.2-75576b2c/
+    path: /ubuntu-squash/releases/download/22.04.3-75576b2c/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: ubuntu
-    version: 22.04.2
+    version: 22.04.3
     codename: jammy
     flavor: netboot
     kernel: ubuntu-netboot-22.04-arm64
     arch: arm64
   ubuntu-22.04-default-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-54de5f62/
+    path: /ubuntu-squash/releases/download/22.04.3-54de5f62/
     files:
     - filesystem.squashfs
     - initrd
@@ -1500,7 +1500,7 @@ endpoints:
     flavor: GNOME
     kernel: ubuntu-22.04-default-squash
   ubuntu-22.04-XFCE-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-e90ee6cf/
+    path: /ubuntu-squash/releases/download/22.04.3-e90ee6cf/
     files:
     - filesystem.squashfs
     - initrd
@@ -1510,7 +1510,7 @@ endpoints:
     flavor: XFCE
     kernel: ubuntu-22.04-XFCE-squash
   ubuntu-22.04-MATE-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-674ed122/
+    path: /ubuntu-squash/releases/download/22.04.3-674ed122/
     files:
     - filesystem.squashfs
     - initrd
@@ -1520,7 +1520,7 @@ endpoints:
     flavor: MATE
     kernel: ubuntu-22.04-MATE-squash
   ubuntu-22.04-Budgie-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-ac20ec7d/
+    path: /ubuntu-squash/releases/download/22.04.3-ac20ec7d/
     files:
     - filesystem.squashfs
     - initrd
@@ -1530,7 +1530,7 @@ endpoints:
     flavor: Budgie
     kernel: ubuntu-22.04-Budgie-squash
   ubuntu-22.04-KDE-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-f094e35e/
+    path: /ubuntu-squash/releases/download/22.04.3-f094e35e/
     files:
     - filesystem.squashfs
     - initrd
@@ -1540,7 +1540,7 @@ endpoints:
     flavor: KDE
     kernel: ubuntu-22.04-KDE-squash
   ubuntu-22.04-kylin-squash:
-    path: /ubuntu-squash/releases/download/22.04.2-565f6520/
+    path: /ubuntu-squash/releases/download/22.04.3-565f6520/
     files:
     - filesystem.squashfs
     - initrd
@@ -1576,87 +1576,6 @@ endpoints:
     version: '22.04'
     flavor: intel-amd
     kernel: pop-22.04-default-squash
-  fedora-36-gnome:
-    path: /fedora-assets/releases/download/1.5-c9f1fb5a/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: GNOME
-  fedora-36-KDE:
-    path: /fedora-assets/releases/download/1.5-da35ad5c/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: KDE
-  fedora-36-LXDE:
-    path: /fedora-assets/releases/download/1.5-0252df72/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: LXDE
-  fedora-36-Cinnamon:
-    path: /fedora-assets/releases/download/1.5-a4aa876b/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: Cinnamon
-  fedora-36-LXQt:
-    path: /fedora-assets/releases/download/1.5-e389781d/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: LXQt
-  fedora-36-SoaS:
-    path: /fedora-assets/releases/download/1.5-5e30ae81/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: SoaS
-  fedora-36-MATE_Compiz:
-    path: /fedora-assets/releases/download/1.5-695457f0/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: MATE_Compiz
-  fedora-36-i3:
-    path: /fedora-assets/releases/download/1.5-8efce5c5/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: i3
-  fedora-36-Xfce:
-    path: /fedora-assets/releases/download/1.5-8a299814/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 36
-    flavor: Xfce
   vmware-photon-x86_64:
     path: /asset-mirror/releases/download/4.0-5a977251/
     files:
@@ -1693,33 +1612,33 @@ endpoints:
     version: 6.4
     kernel: linux-lite-6-squash
   mint-21-cinnamon-squash:
-    path: /ubuntu-squash/releases/download/21.1-bdd51a52/
+    path: /ubuntu-squash/releases/download/21.2-bdd51a52/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.1'
+    version: '21.2'
     flavor: Cinnamon
     kernel: mint-21-cinnamon-squash
   mint-21-mate-squash:
-    path: /ubuntu-squash/releases/download/21.1-75ebe6b6/
+    path: /ubuntu-squash/releases/download/21.2-75ebe6b6/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.1'
+    version: '21.2'
     flavor: mate
     kernel: mint-21-mate-squash
   mint-21-xfce-squash:
-    path: /ubuntu-squash/releases/download/21.1-150134f0/
+    path: /ubuntu-squash/releases/download/21.2-150134f0/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.1'
+    version: '21.2'
     flavor: xfce
     kernel: mint-21-xfce-squash
   oracle-9-x86_64:
@@ -1780,80 +1699,6 @@ endpoints:
     os: garuda
     flavor: cinnamon
     version: 230501
-  ubuntu-netboot-22.10-arm64:
-    path: /ubuntu-squash/releases/download/22.10-0c7dfe1c/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    codename: kinetic
-    flavor: netboot
-    kernel: ubuntu-netboot-22.10-arm64
-    arch: arm64
-  ubuntu-netboot-22.10-amd64:
-    path: /ubuntu-squash/releases/download/22.10-a9990c06/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    codename: kinetic
-    flavor: netboot
-    kernel: ubuntu-netboot-22.10-amd64
-    arch: amd64
-  ubuntu-22.10-XFCE-squash:
-    path: /ubuntu-squash/releases/download/22.10-ff902440/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: XFCE
-    kernel: ubuntu-22.10-XFCE-squash
-  ubuntu-22.10-MATE-squash:
-    path: /ubuntu-squash/releases/download/22.10-636355d9/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: MATE
-    kernel: ubuntu-22.10-MATE-squash
-  ubuntu-22.10-default-squash:
-    path: /ubuntu-squash/releases/download/22.10-dd84401a/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: GNOME
-    kernel: ubuntu-22.10-default-squash
-  ubuntu-22.10-Budgie-squash:
-    path: /ubuntu-squash/releases/download/22.10-95310d02/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: Budgie
-    kernel: ubuntu-22.10-Budgie-squash
-  ubuntu-22.10-KDE-squash:
-    path: /ubuntu-squash/releases/download/22.10-4c45260c/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: KDE
-    kernel: ubuntu-22.10-KDE-squash
   ubuntu-22.04-studio-squash:
     path: /ubuntu-squash/releases/download/22.04.1-f22bcaf8/
     files:
@@ -1972,16 +1817,6 @@ endpoints:
     os: elementary-os
     version: '7'
     kernel: elementaryos-7-default-squash
-  ubuntu-22.10-LXQT-squash:
-    path: /ubuntu-squash/releases/download/22.10-f1dc5249/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '22.10'
-    flavor: LXQT
-    kernel: ubuntu-22.10-LXQT-squash
   ubuntu-18.04-LXQT-squash:
     path: /ubuntu-squash/releases/download/18.04.5-fe2c4150/
     files:
@@ -2155,14 +1990,14 @@ endpoints:
     flavor: kylin
     kernel: ubuntu-23.04-kylin-squash
   debian-12-live-kernel:
-    path: /debian-core-12/releases/download/12.0.0-825b8b20/
+    path: /debian-core-12/releases/download/12.1.0-825b8b20/
     files:
     - initrd
     - vmlinuz
     os: debian
     version: '12'
   debian-12-default-squash:
-    path: /debian-squash/releases/download/12.0.0-07c46b7d/
+    path: /debian-squash/releases/download/12.1.0-07c46b7d/
     files:
     - filesystem.squashfs
     os: debian
@@ -2170,7 +2005,7 @@ endpoints:
     flavor: core
     kernel: debian-12-live-kernel
   debian-12-gnome-squash:
-    path: /debian-squash/releases/download/12.0.0-702d8308/
+    path: /debian-squash/releases/download/12.1.0-702d8308/
     files:
     - filesystem.squashfs
     os: debian
@@ -2178,7 +2013,7 @@ endpoints:
     flavor: gnome
     kernel: debian-12-live-kernel
   debian-12-cinnamon-squash:
-    path: /debian-squash/releases/download/12.0.0-11cf9de3/
+    path: /debian-squash/releases/download/12.1.0-11cf9de3/
     files:
     - filesystem.squashfs
     os: debian
@@ -2186,7 +2021,7 @@ endpoints:
     flavor: cinnamon
     kernel: debian-12-live-kernel
   debian-12-lxqt-squash:
-    path: /debian-squash/releases/download/12.0.0-19d86b60/
+    path: /debian-squash/releases/download/12.1.0-19d86b60/
     files:
     - filesystem.squashfs
     os: debian
@@ -2194,7 +2029,7 @@ endpoints:
     flavor: lxqt
     kernel: debian-12-live-kernel
   debian-12-mate-squash:
-    path: /debian-squash/releases/download/12.0.0-3a5afa24/
+    path: /debian-squash/releases/download/12.1.0-3a5afa24/
     files:
     - filesystem.squashfs
     os: debian
@@ -2202,7 +2037,7 @@ endpoints:
     flavor: mate
     kernel: debian-12-live-kernel
   debian-12-lxde-squash:
-    path: /debian-squash/releases/download/12.0.0-3405e186/
+    path: /debian-squash/releases/download/12.1.0-3405e186/
     files:
     - filesystem.squashfs
     os: debian
@@ -2210,7 +2045,7 @@ endpoints:
     flavor: lxde
     kernel: debian-12-live-kernel
   debian-12-xfce-squash:
-    path: /debian-squash/releases/download/12.0.0-1eb5a4c8/
+    path: /debian-squash/releases/download/12.1.0-1eb5a4c8/
     files:
     - filesystem.squashfs
     os: debian
@@ -2218,10 +2053,20 @@ endpoints:
     flavor: xfce
     kernel: debian-12-live-kernel
   debian-12-kde-squash:
-    path: /debian-squash/releases/download/12.0.0-38c053c1/
+    path: /debian-squash/releases/download/12.1.0-38c053c1/
     files:
     - filesystem.squashfs
     os: debian
     version: '12'
     flavor: kde
     kernel: debian-12-live-kernel
+  ubuntu-23.04-default-squash:
+    path: /ubuntu-squash/releases/download/23.04-0740135d/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: ubuntu
+    version: '23.04'
+    flavor: GNOME
+    kernel: ubuntu-23.04-default-squash

+ 31 - 47
roles/netbootxyz/defaults/main.yml

@@ -127,14 +127,10 @@ releases:
     mirror: http://repo.almalinux.org
     name: AlmaLinux
     versions:
-    - code_name: 9.2
-      name: 9.2
-    - code_name: 9.1
-      name: 9.1
-    - code_name: 9.0
-      name: 9.0
-    - code_name: 8.7
-      name: 8.7
+    - code_name: 9
+      name: 9 (Latest)
+    - code_name: 8
+      name: 8 (Latest)
   alpinelinux:
     base_dir: alpine
     enabled: true
@@ -160,8 +156,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2023.07.01
-      name: 2023.07.01
+    - code_name: 2023.09.01
+      name: 2023.09.01
   blackarch:
     enabled: true
     menu: linux
@@ -193,11 +189,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 38.20230609.3.0
+    - code_name: 38.20230819.3.0
       name: stable
-    - code_name: 38.20230625.2.0
+    - code_name: 38.20230902.2.0
       name: testing
-    - code_name: 38.20230625.1.0
+    - code_name: 38.20230902.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -227,15 +223,15 @@ releases:
     name: Devuan
     versions:
       stable:
+      - code_name: daedalus
+        name: 5.0 Daedalus (stable)
       - code_name: chimaera
-        name: 4.0 Chimaera (stable)
+        name: 4.0 Chimaera (oldstable)
       - code_name: beowulf
-        name: 3.0 Beowulf (oldstable)
-      - code_name: ascii
-        name: 2.1 ASCII (oldoldstable)
+        name: 3.1 Beowulf (oldoldstable)
       testing:
-      - code_name: daedalus
-        name: Daedalus (testing)
+      - code_name: excalibur
+        name: Excalibur (testing)
   fedora:
     base_dir: fedora
     enabled: true
@@ -293,8 +289,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.27-core175
-      name: 2.27 Core175
+    - code_name: 2.27-core178
+      name: 2.27 Core178
   k3os:
     enabled: true
     menu: linux
@@ -400,7 +396,7 @@ releases:
     enabled: true
     menu: linux
     mirror: http://download.opensuse.org
-    name: OpenSUSE
+    name: openSUSE
     versions:
     - code_name: '15.5'
       name: openSUSE Leap 15.5
@@ -438,20 +434,10 @@ releases:
     mirror: http://download.rockylinux.org
     name: Rocky Linux
     versions:
-    - code_name: 9.2
-      name: 9.2
-    - code_name: 9.1
-      name: 9.1
-    - code_name: 9.0
-      name: 9.0
-    - code_name: 8.7
-      name: 8.7
-    - code_name: 8.6
-      name: 8.6
-    - code_name: 8.5
-      name: 8.5
-    - code_name: 8.4
-      name: 8.4
+    - code_name: 9
+      name: 9 (Latest)
+    - code_name: 8
+      name: 8 (Latest)
   scientific:
     base_dir: linux/scientific
     enabled: true
@@ -489,14 +475,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
-    - code_name: 20230629T053622Z
-      name: 20230629T053622Z
-    - code_name: 20230615T000418Z
-      name: 20230615T000418Z
-    - code_name: 20230601T000726Z
-      name: 20230601T000726Z
-    - code_name: 20230518T234918Z
-      name: 20230518T234918Z
+    - code_name: 20230907T000420Z
+      name: 20230907T000420Z
+    - code_name: 20230828T151332Z
+      name: 20230828T151332Z
+    - code_name: 20230824T000638Z
+      name: 20230824T000638Z
+    - code_name: 20230810T000714Z
+      name: 20230810T000714Z
   talos:
     enabled: true
     menu: linux
@@ -633,8 +619,6 @@ releases:
     versions:
     - code_name: lunar
       name: 23.04 Lunar Lobster
-    - code_name: kinetic
-      name: 22.10 Kinetic Kudu
     - code_name: jammy
       name: 22.04 LTS Jammy Jellyfish
     - code_name: focal
@@ -864,7 +848,7 @@ utilitiespcbios64:
     enabled: true
     name: Ultimate Boot CD (UBCD)
     type: memdisk
-    util_path: http://mirror.sysadminguide.net/ubcd/ubcd539.iso
+    util_path: https://mirror.sysadminguide.net/ubcd/ubcd539.iso
     version: '539'
 wimboot_location: http://${boot_domain}/wimboot
 wimboot_upstream_url: https://github.com/ipxe/wimboot/releases/latest/download/wimboot

+ 1 - 0
roles/netbootxyz/tasks/generate_disks_base.yml

@@ -81,6 +81,7 @@
     - src/config/local/crypto.h
     - src/config/local/usb.h
     - src/config/local/settings.h
+    - src/config/local/isa.h
 
 - name: Retrieve iPXE CA
   ansible.builtin.get_url:

+ 20 - 4
roles/netbootxyz/templates/disks/netboot.xyz.j2

@@ -7,12 +7,14 @@ set fg_cya ${esc:string}[36m
 set fg_whi ${esc:string}[37m
 set VARS_ERR Local vars file not found... attempting TFTP boot...
 set TFTP_ERR Local TFTP failed... attempting remote HTTPS
+set V6_ERR IPv6 appears to have failed... attempting IPv4...
 set HTTPS_ERR HTTPS appears to have failed... attempting HTTP
 set HTTP_ERR HTTP has failed, localbooting...
 set site_name {{ site_name }}
 set boot_domain {{ boot_domain }}
 set ipxe_version ${version}
 set version {{ boot_version }}
+set conn_type https
 
 :start
 echo ${bold}${fg_gre}${site_name} - ${fg_whi}v${version}${boldoff}
@@ -101,15 +103,29 @@ chain --autofree tftp://${tftp-server}/menu.ipxe || echo ${TFTP_ERR} && goto men
 
 :menu
 {% if bootloader_https_enabled | bool %}
+:menu_https
 set conn_type https
-chain --autofree https://${boot_domain}/menu.ipxe || echo ${HTTPS_ERR}
-sleep 5
+goto menu_start
 {% endif %}
+
 {% if bootloader_http_enabled | bool %}
+:menu_http
 set conn_type http
-chain --autofree http://${boot_domain}/menu.ipxe || echo ${HTTP_ERR}
+goto menu_start
 {% endif %}
-goto localboot
+
+:menu_start
+isset ${netX/dns6} && goto menu_v6 || goto menu_v4
+:menu_v6
+isset ${netX/dns6_bak} && set netX/dns6 ${netX/dns6_bak} ||
+set netX/dns6_bak ${netX/dns6}
+echo Attempting ${conn_type} boot over IPv6...
+chain --autofree ${conn_type}://${boot_domain}/menu.ipxe || echo ${conn_type} IPv6 failed... attempting IPv4...
+clear netX/dns6
+:menu_v4
+echo Attempting ${conn_type} boot over IPv4...
+chain --autofree ${conn_type}://${boot_domain}/menu.ipxe || echo ${conn_type} IPv4 failed...
+iseq ${conn_type} https && goto menu_http || goto localboot
 
 :localboot
 exit

+ 9 - 12
roles/netbootxyz/templates/menu/almalinux.ipxe.j2

@@ -30,8 +30,7 @@ menu ${os} ${os_arch} boot type
 item graphical ${ova} graphical installer
 item text ${ova} text based installer
 item rescue ${ova} rescue
-item kickstart ${ova} set kickstart url [ ${ksurl} ]
-item kickstart_device ${ova} set ksdevice [ ${ksdevice} ]
+item kickstart ${ova} set kickstart url [ ${ks_url} ]
 isset ${bt} || choose bt || goto almalinux
 echo ${cls}
 iseq ${bt} text && goto text ||
@@ -40,8 +39,12 @@ iseq ${bt} kickstart && goto kickstart ||
 iseq ${bt} kickstart_device && goto kickstart_device ||
 goto bootos_images
 
+:graphical
+set install_mode inst.graphical ||
+goto bootos_images
+
 :text
-set params inst.text ||
+set install_mode inst.text ||
 goto bootos_images
 
 :rescue
@@ -49,20 +52,14 @@ set params rescue ||
 goto bootos_images
 
 :kickstart
-echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params inst.ks=${ksurl} ||
-clear bt
-goto boottype
-
-:kickstart_device
-echo -n Specify ksdevice param for ${os} ${osversion}: && read ksdevice
-set ksdevice ${ksdevice} ||
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ks_url
+set params inst.ks=${ks_url} ||
 clear bt
 goto boottype
 
 :bootos_images
 imgfree
-kernel ${almalinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
+kernel ${almalinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${almalinux_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

+ 9 - 12
roles/netbootxyz/templates/menu/centos.ipxe.j2

@@ -31,8 +31,7 @@ menu ${os} ${os_arch} boot type
 item graphical ${ova} graphical installer
 item text ${ova} text based installer
 item rescue ${ova} rescue
-item kickstart ${ova} set kickstart url [ ${ksurl} ]
-item kickstart_device ${ova} set ksdevice [ ${ksdevice} ]
+item kickstart ${ova} set kickstart url [ ${ks_url} ]
 isset ${bt} || choose bt || goto centos
 echo ${cls}
 iseq ${bt} text && goto text ||
@@ -41,8 +40,12 @@ iseq ${bt} kickstart && goto kickstart ||
 iseq ${bt} kickstart_device && goto kickstart_device ||
 goto bootos_images
 
+:graphical
+set install_mode inst.graphical ||
+goto bootos_images
+
 :text
-set params inst.text ||
+set install_mode inst.text ||
 goto bootos_images
 
 :rescue
@@ -50,14 +53,8 @@ set params rescue ||
 goto bootos_images
 
 :kickstart
-echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params inst.ks=${ksurl} ||
-clear bt
-goto boottype
-
-:kickstart_device
-echo -n Specify ksdevice param for ${os} ${osversion}: && read ksdevice
-set ksdevice ${ksdevice} ||
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ks_url
+set params inst.ks=${ks_url} ||
 clear bt
 goto boottype
 
@@ -66,7 +63,7 @@ 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} ${params} ${ipparam} {{ kernel_params }}
+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
 echo MD5sums:

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

@@ -33,6 +33,7 @@ item Everything ${ova} Everything
 item Server ${ova} Server
 item Kinoite ${ova} Kinoite
 item Silverblue ${ova} Silverblue 
+item Sericea ${ova} Sericea
 isset ${sku_type} || choose sku_type || goto fedora
 set dir ${fedora_base_dir}/releases/${osversion}/${sku_type}/${os_arch}/os
 iseq ${osversion} rawhide && set dir ${fedora_base_dir}/development/${osversion}/${sku_type}/${os_arch}/os ||
@@ -45,28 +46,33 @@ menu ${os} ${os_arch} boot type
 item normal ${ova} graphical install
 item text ${ova} text install
 item rescue ${ova} rescue
-item kickstart ${ova} specify kickstart url
+item kickstart ${ova} set kickstart url [ ${ks_url} ]
 isset ${bt} || choose bt || goto fedora
 echo ${cls}
 iseq ${bt} normal && goto boot ||
 goto ${bt}
 
+:graphical
+set install_mode inst.graphical ||
+goto bootos_images
+
 :text
-set params inst.text ||
-goto boot
+set install_mode inst.text ||
+goto bootos_images
 
 :rescue
 set params rescue ||
-goto boot
+goto bootos_images
 
 :kickstart
-echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params inst.ks=${ksurl} ||
-goto boot
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ks_url
+set params inst.ks=${ks_url} ||
+clear bt
+goto boottype
 
 :boot
 imgfree
-kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${fedora_mirror}/${dir} ${params} ${ipparam} {{ kernel_params }}
+kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${fedora_mirror}/${dir} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${fedora_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

+ 1 - 0
roles/netbootxyz/templates/menu/linux-arm.ipxe.j2

@@ -12,6 +12,7 @@ item debian ${space} Debian
 item coreos ${space} Fedora CoreOS
 item gentoo ${space} Gentoo
 item fedora ${space} Fedora
+item nixos ${space} NixOS
 item opensuse ${space} openSUSE
 item oracle ${space} Oracle Linux
 item rhel ${space} Red Hat Enterprise Linux

+ 1 - 1
roles/netbootxyz/templates/menu/linux-i386.ipxe.j2

@@ -10,7 +10,7 @@ item alpinelinux ${space} Alpine Linux
 item debian ${space} Debian
 item gentoo ${space} Gentoo
 item kali ${space} Kali Linux
-item opensuse ${space} OpenSUSE
+item opensuse ${space} openSUSE
 choose menu || goto linux_exit
 echo ${cls}
 goto ${menu} ||

+ 4 - 4
roles/netbootxyz/templates/menu/live-ubuntu.ipxe.j2

@@ -6,7 +6,7 @@ goto ${menu} ||
 set os Ubuntu Live
 menu ${os}
 item --gap ${os} Versions
-item kinetic ${space} ${os} 22.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
@@ -15,9 +15,9 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
-:kinetic
+:lunar
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "ubuntu" and 'squash' in key and value.version == "22.10" %}
+{% 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 %}
@@ -74,7 +74,7 @@ boot
 
 :20.04-boot
 :22.04-boot
-:22.10-boot
+:23.04-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

+ 5 - 2
roles/netbootxyz/templates/menu/nixos.ipxe.j2

@@ -4,7 +4,10 @@
 # https://nixos.org/
 
 set os {{ releases.nixos.name }}
-menu ${os}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch x86_64 ||
+iseq ${os_arch} arm64 && set os_arch aarch64 ||
+menu ${os} - ${os_arch}
 item --gap Official Releases
 {% for item in releases.nixos.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -12,7 +15,7 @@ item {{ item.code_name }} ${space} ${os} {{ item.name }}
 choose version || goto nixos_exit
 
 imgfree
-chain https://github.com/nix-community/nixos-images/releases/download/${version}/netboot-x86_64-linux.ipxe
+chain https://github.com/nix-community/nixos-images/releases/download/${version}/netboot-${os_arch}-linux.ipxe
 goto nixos_exit
 
 :nixos_exit

+ 9 - 12
roles/netbootxyz/templates/menu/openEuler.ipxe.j2

@@ -27,8 +27,7 @@ menu ${os} ${arch} boot type
 item graphical ${ova} graphical installer
 item text ${ova} text based installer
 item rescue ${ova} rescue
-item kickstart ${ova} set kickstart url [ ${ksurl} ]
-item kickstart_device ${ova} set ksdevice [ ${ksdevice} ]
+item kickstart ${ova} set kickstart url [ ${ks_url} ]
 isset ${bt} || choose bt || goto openEuler
 echo ${cls}
 iseq ${bt} text && goto text ||
@@ -37,8 +36,12 @@ iseq ${bt} kickstart && goto kickstart ||
 iseq ${bt} kickstart_device && goto kickstart_device ||
 goto bootos_images
 
+:graphical
+set install_mode inst.graphical ||
+goto bootos_images
+
 :text
-set params inst.text ||
+set install_mode inst.text ||
 goto bootos_images
 
 :rescue
@@ -46,20 +49,14 @@ set params rescue ||
 goto bootos_images
 
 :kickstart
-echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params inst.ks=${ksurl} ||
-clear bt
-goto boottype
-
-:kickstart_device
-echo -n Specify ksdevice param for ${os} ${osversion}: && read ksdevice
-set ksdevice ${ksdevice} ||
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ks_url
+set params inst.ks=${ks_url} ||
 clear bt
 goto boottype
 
 :bootos_images
 imgfree
-kernel ${openEuler_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
+kernel ${openEuler_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${openEuler_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

+ 1 - 1
roles/netbootxyz/templates/menu/opensuse.ipxe.j2

@@ -1,6 +1,6 @@
 #!ipxe
 
-# OpenSUSE Operating System
+# openSUSE Operating System
 # http://opensuse.org
 
 isset ${dhcp-server} || goto static_ip

+ 9 - 13
roles/netbootxyz/templates/menu/rockylinux.ipxe.j2

@@ -30,18 +30,20 @@ menu ${os} ${os_arch} boot type
 item graphical ${ova} graphical installer
 item text ${ova} text based installer
 item rescue ${ova} rescue
-item kickstart ${ova} set kickstart url [ ${ksurl} ]
-item kickstart_device ${ova} set ksdevice [ ${ksdevice} ]
+item kickstart ${ova} set kickstart url [ ${ks_url} ]
 isset ${bt} || choose bt || goto rockylinux
 echo ${cls}
 iseq ${bt} text && goto text ||
 iseq ${bt} rescue && goto rescue ||
 iseq ${bt} kickstart && goto kickstart ||
-iseq ${bt} kickstart_device && goto kickstart_device ||
+goto bootos_images
+
+:graphical
+set install_mode inst.graphical ||
 goto bootos_images
 
 :text
-set params inst.text ||
+set install_mode inst.text ||
 goto bootos_images
 
 :rescue
@@ -49,20 +51,14 @@ set params rescue ||
 goto bootos_images
 
 :kickstart
-echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
-set params inst.ks=${ksurl} ||
-clear bt
-goto boottype
-
-:kickstart_device
-echo -n Specify ksdevice param for ${os} ${osversion}: && read ksdevice
-set ksdevice ${ksdevice} ||
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ks_url
+set params inst.ks=${ks_url} ||
 clear bt
 goto boottype
 
 :bootos_images
 imgfree
-kernel ${rockylinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
+kernel ${rockylinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${install_mode} ${params} ${ipparam} {{ kernel_params }}
 initrd ${rockylinux_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

+ 0 - 1
roles/netbootxyz/templates/menu/ubuntu.ipxe.j2

@@ -27,7 +27,6 @@ choose ubuntu_version || goto ubuntu_exit
 iseq ${ubuntu_version} older_release && goto older_release ||
 iseq ${ubuntu_version} focal && set install_type sub ||
 iseq ${ubuntu_version} jammy && set install_type sub ||
-iseq ${ubuntu_version} kinetic && set install_type sub ||
 iseq ${ubuntu_version} lunar && set install_type sub ||
 iseq ${ubuntu_version} focal-legacy && set ubuntu_version focal ||
 iseq ${install_type} sub && goto boot_type ||

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.70
+2.0.71