Prechádzať zdrojové kódy

Merge pull request #1147 from netbootxyz/development

Release 2.0.61-RC
Antony Messerli 2 rokov pred
rodič
commit
fa145dd004

+ 6 - 1
.ansible-lint

@@ -1,3 +1,8 @@
 # .ansible-lint
 skip_list:
-  - '208'  
+  - '208'
+  - command-instead-of-module  # Using command rather than module.
+  - command-instead-of-shell  # Use shell only when shell functionality is required.
+  - no-changed-when  # Commands should not change things if nothing needs doing.
+  - risky-shell-pipe  # Shells that use pipes should set the pipefail option.
+  - literal-compare  # Don't compare to literal True/False.

+ 5 - 3
.github/workflows/pull-requests.yml

@@ -14,8 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v3
-
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+        
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -35,7 +37,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - uses: actions/setup-python@v3
+    - uses: actions/setup-python@v4
 
     - name: Build PR release
       run: |

+ 12 - 0
CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.61] - 2022-08-28
+#### Added
+- Various version updates
+- Viewpoint attribute on boot.netboot.xyz index
+- Oracle Linux aarch64
+
+#### Changes
+- Various Ansible Lint fixes
+
+#### Fixed
+- Ubuntu 22.04 version issues related to minor increments
+
 ## [2.0.60] - 2022-07-24
 #### Added
 - Added Fedora Kionite

+ 7 - 0
README.md

@@ -1,8 +1,11 @@
 ## netboot.xyz [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Your%20favorite%20operating%20systems%20in%20one%20place!&url=https://netboot.xyz&hashtags=netbootxyz,ipxe,pxe,linux,tech,code)
 
+Your favorite operating systems in one place!
+
 [![Build Status](https://github.com/netbootxyz/netboot.xyz/workflows/release/badge.svg)](https://github.com/netbootxyz/netboot.xyz/actions?query=workflow%3Arelease)
 [![Discord](https://img.shields.io/discord/425186187368595466)](https://discord.gg/An6PA2a)
 [![Release](https://img.shields.io/github/v/release/netbootxyz/netboot.xyz?color=hunter%20green)](https://github.com/netbootxyz/netboot.xyz/releases/latest)
+![GitHub all releases](https://img.shields.io/github/downloads/netbootxyz/netboot.xyz/total)
 
 ![netboot.xyz menu](https://netboot.xyz/images/netboot.xyz.gif)
 
@@ -212,6 +215,10 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | The Smallest Server Suite | https://thesss.4mlinux.com/ | Kernel/Initrd |
 | Ultimate Boot CD | http://www.ultimatebootcd.com | ISO - Memdisk |
 
+### Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/netbootxyz/netboot.xyz.svg)](https://starchart.cc/netbootxyz/netboot.xyz)
+
 ### Feedback
 
 Feel free to open up an [issue](https://github.com/netbootxyz/netboot.xyz/issues) on Github or ping us on [Discord](https://discord.gg/An6PA2a).  Follow us on [Twitter](https://twitter.com/netbootxyz) and like us on [Facebook](https://www.facebook.com/netboot.xyz)!

+ 99 - 60
endpoints.yml

@@ -141,13 +141,13 @@ endpoints:
     flavor: mate
     kernel: debian-10-live-kernel
   kali-xfce-squash:
-    path: /debian-squash/releases/download/2022.2-0e465d0f/
+    path: /debian-squash/releases/download/2022.3-0e465d0f/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: kali
-    version: '2022.2'
+    version: '2022.3'
     flavor: xfce
     kernel: kali-xfce-squash
   pop-19.10-default-squash:
@@ -235,7 +235,7 @@ endpoints:
     flavor: default
     kernel: backbox-6-default-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20220721-0952-92641c1f/
+    path: /ubuntu-squash/releases/download/20220818-0947-92641c1f/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -359,7 +359,7 @@ endpoints:
     os: dban
     version: 2.3.0
   sparky-stable-mingui:
-    path: /debian-squash/releases/download/6.3-3ce06fd8/
+    path: /debian-squash/releases/download/6.4-3ce06fd8/
     files:
     - filesystem.squashfs
     - initrd
@@ -369,7 +369,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-stable-mingui
   sparky-stable-gui:
-    path: /debian-squash/releases/download/6.3-68d251e3/
+    path: /debian-squash/releases/download/6.4-68d251e3/
     files:
     - filesystem.squashfs
     - initrd
@@ -379,7 +379,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-stable-gui
   sparky-stable-lxqt:
-    path: /debian-squash/releases/download/6.3-17a93b7c/
+    path: /debian-squash/releases/download/6.4-17a93b7c/
     files:
     - filesystem.squashfs
     - initrd
@@ -419,13 +419,14 @@ endpoints:
     flavor: lxqt
     kernel: sparky-rolling-lxqt
   oracle-8:
-    path: /asset-mirror/releases/download/5-a778a084/
+    path: /asset-mirror/releases/download/5-32d9360b/
     files:
     - vmlinuz
     - initrd
     - squashfs.img
     os: oracle
     version: '8'
+    arch: x86_64
   oracle-7:
     path: /asset-mirror/releases/download/u9-9cd2ea57/
     files:
@@ -434,6 +435,7 @@ endpoints:
     - squashfs.img
     os: oracle
     version: '7'
+    arch: x86_64
   kodachi-6:
     path: /ubuntu-squash/releases/download/6.2-2a23039c/
     files:
@@ -564,7 +566,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.18.11-2022.07.13-a3024eea/
+    path: /asset-mirror/releases/download/5.19.2-2-2022.08.21-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -620,7 +622,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/21.3.5-minimal-220721-linux515-d54e0ff9/
+    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-7ea48fd9/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -629,11 +631,11 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.3.5-minimal-220721-linux515
+    version: current
     flavor: xfce
     kernel: manjaro-xfce-current
   manjaro-gnome-current:
-    path: /manjaro-squash/releases/download/21.3.5-minimal-220721-linux515-beb953af/
+    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-2ba627e6/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -642,11 +644,11 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.3.5-minimal-220721-linux515
+    version: current
     flavor: gnome
     kernel: manjaro-gnome-current
   manjaro-kde-current:
-    path: /manjaro-squash/releases/download/21.3.5-minimal-220721-linux515-5eba52db/
+    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-d09677f5/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -655,7 +657,7 @@ endpoints:
     - initrd
     - vmlinuz
     os: manjaro
-    version: 21.3.5-minimal-220721-linux515
+    version: current
     flavor: kde
     kernel: manjaro-kde-current
   fatdog:
@@ -682,7 +684,7 @@ endpoints:
     version: current
     flavor: full
   4mlinux-thesss:
-    path: /asset-mirror/releases/download/39.1-3ec6e844/
+    path: /asset-mirror/releases/download/40.0-3ec6e844/
     files:
     - initrd
     - vmlinuz
@@ -705,17 +707,6 @@ endpoints:
     os: 4mlinux
     version: current
     flavor: AntivirusLiveCD
-  manjaro-default-current:
-    path: /manjaro-squash/releases/download/20.0.3-200607-linux56-62be2419/
-    files:
-    - livefs.sfs
-    - rootfs.sfs
-    - initrd
-    - vmlinuz
-    os: manjaro
-    version: current
-    flavor: architect
-    kernel: manjaro-default-current
   ubuntu-20.04-default-squash:
     path: /ubuntu-squash/releases/download/20.04.4-9bc4558b/
     files:
@@ -852,7 +843,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/202207220217-8fd60881/
+    path: /debian-squash/releases/download/202208240217-8fd60881/
     files:
     - filesystem.squashfs
     - initrd
@@ -933,13 +924,13 @@ endpoints:
     os: nitrux
     version: 2022.02.28
   endeavouros:
-    path: /asset-mirror/releases/download/Apollo_22_1-190ee67a/
+    path: /asset-mirror/releases/download/Artemis_neo_22_7-190ee67a/
     files:
     - airootfs.sfs
     - initrd
     - vmlinuz
     os: endeavouros
-    version: Apollo_22_1
+    version: Artemis_neo_22_7
   kodachi-8:
     path: /ubuntu-squash/releases/download/8.2-625e11fa/
     files:
@@ -1216,40 +1207,40 @@ endpoints:
     os: memtest86-free
     version: '9.4'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20220718T170539Z-6734abfd/
+    path: /asset-mirror/releases/download/20220822T170541Z-6734abfd/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220718T170539Z
+    version: 20220822T170541Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20220717T224630Z-079d67cf/
+    path: /asset-mirror/releases/download/20220821T231852Z-079d67cf/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220717T224630Z
+    version: 20220821T231852Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20220720T223721Z-383e823f/
+    path: /asset-mirror/releases/download/20220821T170533Z-383e823f/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20220720T223721Z
+    version: 20220821T170533Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/5.2-81501ab2/
+    path: /asset-mirror/releases/download/5.4-81501ab2/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     os: tails
-    version: '5.2'
+    version: '5.4'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20211227-bed8dd88/
@@ -1293,13 +1284,13 @@ endpoints:
     version: 9.03
     arch: i686
   systemrescue-amd64:
-    path: /asset-mirror/releases/download/9.03-0113453c/
+    path: /asset-mirror/releases/download/9.04-0113453c/
     files:
     - airootfs.sfs
     - initrd
     - vmlinuz
     os: systemrescue
-    version: 9.03
+    version: 9.04
     arch: amd64
   shredos-i686:
     path: /asset-mirror/releases/download/v2020.02.008_i686-0.30.001-40f7c576/
@@ -1316,13 +1307,13 @@ endpoints:
     version: v2021.08.2_21_x86-64_0.32.023
     arch: x86_64
   archlinux-32:
-    path: /asset-mirror/releases/download/2022.07.01-6dbad0f9/
+    path: /asset-mirror/releases/download/2022.08.02-6dbad0f9/
     files:
     - airootfs.sfs
     - initramfs-linux.img
     - vmlinuz-linux
     os: archlinux
-    version: 2022.07.01
+    version: 2022.08.02
     arch: i686
   q4os-4.6-default-squash:
     path: /debian-squash/releases/download/4.6-2de282e7/
@@ -1376,35 +1367,35 @@ endpoints:
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.0.2-6-5fb1a15b/
+    path: /debian-squash/releases/download/3.0.2-12-5fb1a15b/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.0.2-6
+    version: 3.0.2-12
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
   clonezilla-debian-testing-i686:
-    path: /debian-squash/releases/download/3.0.2-6-ee3863df/
+    path: /debian-squash/releases/download/3.0.2-12-ee3863df/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.0.2-6
+    version: 3.0.2-12
     flavor: testing
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20220711-kinetic-5f251ca8/
+    path: /ubuntu-squash/releases/download/20220824-kinetic-5f251ca8/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20220711-kinetic
+    version: 20220824-kinetic
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
@@ -1691,31 +1682,31 @@ endpoints:
     version: 5.0b1
     arch: amd64
   ubuntu-netboot-22.04-amd64:
-    path: /ubuntu-squash/releases/download/22.04-73e57464/
+    path: /ubuntu-squash/releases/download/22.04.1-dc2f0a12/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: ubuntu
-    version: '22.04'
+    version: 22.04.1
     codename: jammy
     flavor: netboot
     kernel: ubuntu-netboot-22.04-amd64
     arch: amd64
   ubuntu-netboot-22.04-arm64:
-    path: /ubuntu-squash/releases/download/22.04-327c1eca/
+    path: /ubuntu-squash/releases/download/22.04.1-1f994132/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: ubuntu
-    version: '22.04'
+    version: 22.04.1
     codename: jammy
     flavor: netboot
     kernel: ubuntu-netboot-22.04-arm64
     arch: arm64
   ubuntu-22.04-default-squash:
-    path: /ubuntu-squash/releases/download/22.04-e887448b/
+    path: /ubuntu-squash/releases/download/22.04.1-9b5dd18c/
     files:
     - filesystem.squashfs
     - initrd
@@ -1725,7 +1716,7 @@ endpoints:
     flavor: GNOME
     kernel: ubuntu-22.04-default-squash
   ubuntu-22.04-XFCE-squash:
-    path: /ubuntu-squash/releases/download/22.04-0eccaa7c/
+    path: /ubuntu-squash/releases/download/22.04.1-eb8e96d2/
     files:
     - filesystem.squashfs
     - initrd
@@ -1735,7 +1726,7 @@ endpoints:
     flavor: XFCE
     kernel: ubuntu-22.04-XFCE-squash
   ubuntu-22.04-MATE-squash:
-    path: /ubuntu-squash/releases/download/22.04-595a3acb/
+    path: /ubuntu-squash/releases/download/22.04.1-c2d70e34/
     files:
     - filesystem.squashfs
     - initrd
@@ -1745,7 +1736,7 @@ endpoints:
     flavor: MATE
     kernel: ubuntu-22.04-MATE-squash
   ubuntu-22.04-LXDE-squash:
-    path: /ubuntu-squash/releases/download/22.04-fa8aca48/
+    path: /ubuntu-squash/releases/download/22.04.1-54637b4a/
     files:
     - filesystem.squashfs
     - initrd
@@ -1755,7 +1746,7 @@ endpoints:
     flavor: LXDE
     kernel: ubuntu-22.04-LXDE-squash
   ubuntu-22.04-Budgie-squash:
-    path: /ubuntu-squash/releases/download/22.04-082531f0/
+    path: /ubuntu-squash/releases/download/22.04.1-e094057d/
     files:
     - filesystem.squashfs
     - initrd
@@ -1765,7 +1756,7 @@ endpoints:
     flavor: Budgie
     kernel: ubuntu-22.04-Budgie-squash
   ubuntu-22.04-KDE-squash:
-    path: /ubuntu-squash/releases/download/22.04-2aef41c7/
+    path: /ubuntu-squash/releases/download/22.04.1-0968dc1a/
     files:
     - filesystem.squashfs
     - initrd
@@ -1775,7 +1766,7 @@ endpoints:
     flavor: KDE
     kernel: ubuntu-22.04-KDE-squash
   ubuntu-22.04-kylin-squash:
-    path: /ubuntu-squash/releases/download/22.04-38ebacda/
+    path: /ubuntu-squash/releases/download/22.04.1-784b4a68/
     files:
     - filesystem.squashfs
     - initrd
@@ -1909,7 +1900,7 @@ endpoints:
     version: '4.0'
     arch: aarch64
   harvester:
-    path: /asset-mirror/releases/download/v1.0.2-8b597a0d/
+    path: /asset-mirror/releases/download/v1.0.3-8b597a0d/
     files:
     - harvester-vmlinuz-amd64
     - harvester-initrd-amd64
@@ -1917,7 +1908,7 @@ endpoints:
     - harvester-amd64.sha512
     - version.yaml
     os: harvester
-    version: v1.0.2
+    version: v1.0.3
   linux-lite-6-squash:
     path: /ubuntu-squash/releases/download/6.0-8f200db6/
     files:
@@ -1927,3 +1918,51 @@ endpoints:
     os: lite
     version: 6.0
     kernel: linux-lite-6-squash
+  mint-21-cinnamon-squash:
+    path: /ubuntu-squash/releases/download/21-b25d359a/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '21'
+    flavor: Cinnamon
+    kernel: mint-21-cinnamon-squash
+  mint-21-mate-squash:
+    path: /ubuntu-squash/releases/download/21-804dbff2/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '21'
+    flavor: mate
+    kernel: mint-21-mate-squash
+  mint-21-xfce-squash:
+    path: /ubuntu-squash/releases/download/21-b5b60057/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '21'
+    flavor: xfce
+    kernel: mint-21-xfce-squash
+  oracle-9-x86_64:
+    path: /asset-mirror/releases/download/U0-5960d290/
+    files:
+    - vmlinuz
+    - initrd
+    - squashfs.img
+    os: oracle
+    version: '9'
+    arch: x86_64
+  rescuezilla-jammy:
+    path: /asset-mirror/releases/download/2.4-3c3b3e74/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: rescuezilla
+    version: jammy
+    kernel: rescuezilla-jammy

+ 14 - 13
roles/netbootxyz/defaults/main.yml

@@ -147,8 +147,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2022.07.01
-      name: 2022.07.01
+    - code_name: 2022.08.05
+      name: 2022.08.05
   blackarch:
     enabled: true
     menu: linux
@@ -180,11 +180,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 36.20220703.3.1
+    - code_name: 36.20220806.3.0
       name: stable
-    - code_name: 36.20220716.2.0
+    - code_name: 36.20220820.2.0
       name: testing
-    - code_name: 36.20220716.1.0
+    - code_name: 36.20220820.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -384,8 +384,9 @@ releases:
     mirror: https://yum.oracle.com
     name: Oracle Linux
     paths:
-      7: /repo/OracleLinux/OL7/latest/x86_64
-      8: /repo/OracleLinux/OL8/baseos/latest/x86_64
+      7: /repo/OracleLinux/OL7/latest
+      8: /repo/OracleLinux/OL8/baseos/latest
+      9: /repo/OracleLinux/OL9/baseos/latest
   photon:
     enabled: true
     menu: linux
@@ -459,14 +460,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
+    - code_name: 20220825T001415Z
+      name: 20220825T001415Z
+    - code_name: 20220811T015517Z
+      name: 20220811T015517Z
+    - code_name: 20220728T031731Z
+      name: 20220728T031731Z
     - code_name: 20220714T060459Z
       name: 20220714T060459Z
-    - code_name: 20220714T001107Z
-      name: 20220714T001107Z
-    - code_name: 20220630T003722Z
-      name: 20220630T003722Z
-    - code_name: 20220616T001909Z
-      name: 20220616T001909Z
   talos:
     enabled: true
     menu: linux

+ 4 - 12
roles/netbootxyz/tasks/generate_checksums.yml

@@ -1,25 +1,19 @@
 ---
 - name: Register a listing of all created iPXE bootloaders
-  command: ls -I {{ checksums_filename }} {{ netbootxyz_root }}/ipxe/
+  ansible.builtin.command: ls -I {{ checksums_filename }} {{ netbootxyz_root }}/ipxe/
   register: netboot_disks
-  tags:
-    - skip_ansible_lint
 
 - name: Generate date
-  command: date
+  ansible.builtin.command: date
   register: current_date
-  tags:
-    - skip_ansible_lint
 
 - name: Gather stat listing of directory
-  command: sha256sum -b {{ item }}
+  ansible.builtin.command: sha256sum -b {{ item }}
   with_items:
     - "{{ netboot_disks.stdout_lines }}"
   args:
     chdir: "{{ netbootxyz_root }}/ipxe/"
   register: netboot_disks_stat
-  tags:
-    - skip_ansible_lint
 
 - name: Generate ipxe disk checksums
   ansible.builtin.template:
@@ -27,10 +21,8 @@
     dest: "{{ netbootxyz_root }}/ipxe/{{ checksums_filename }}"
 
 - name: Generate site name banner for index
-  shell: toilet -f standard {{ site_name }} --html | grep span
+  ansible.builtin.shell: toilet -f standard {{ site_name }} --html | grep span
   register: index_title
-  tags:
-    - skip_ansible_lint
   when: ansible_os_family == "Debian"
 
 - name: Generate netboot.xyz index template

+ 4 - 10
roles/netbootxyz/tasks/generate_disks_arm.yml

@@ -27,15 +27,13 @@
 # iPXE workaround
 # http://lists.ipxe.org/pipermail/ipxe-devel/2018-August/006254.html
 # apply patch to fix arm64 builds on amd64 builds
-- name: iPXE Workaround for arm
-  shell: sed -i '/WORKAROUND_CFLAGS/d' arch/arm64/Makefile
+- name: Workaround in iPXE for arm
+  ansible.builtin.shell: sed -i '/WORKAROUND_CFLAGS/d' arch/arm64/Makefile
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
 
 - name: Compile iPXE bootloaders for EFI arm64
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make CROSS_COMPILE=aarch64-linux-gnu- \
          ARCH=arm64 \
@@ -46,12 +44,10 @@
          bin-arm64-efi/snponly.efi
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool == false
 
 - name: Compile iPXE bootloader for EFI arm64 with debug flags
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make CROSS_COMPILE=aarch64-linux-gnu- \
          ARCH=arm64 \
@@ -61,8 +57,6 @@
          bin-arm64-efi/snp.efi
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool
 
 - name: Copy iPXE arm64 EFI builds to http directory

+ 2 - 6
roles/netbootxyz/tasks/generate_disks_efi.yml

@@ -25,7 +25,7 @@
   when: generate_signatures | bool
 
 - name: Compile iPXE bootloader for EFI
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
@@ -34,12 +34,10 @@
          bin-x86_64-efi/snponly.efi
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool == false
 
 - name: Compile iPXE bootloader for EFI with debug flags
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
@@ -49,8 +47,6 @@
          bin-x86_64-efi/snponly.efi
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool
 
 - name: Copy iPXE EFI builds to http directory

+ 2 - 6
roles/netbootxyz/tasks/generate_disks_hybrid.yml

@@ -1,23 +1,19 @@
 ---
 
 - name: Generate hybrid ISO image
-  shell: |
+  ansible.builtin.shell: |
     ./util/genfsimg -o {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.iso \
       -s {{ bootloader_filename }} \
       {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.efi \
       {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.lkrn
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
 
 - name: Generate hybrid USB image
-  shell: |
+  ansible.builtin.shell: |
     ./util/genfsimg -o {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.img \
       -s {{ bootloader_filename }} \
       {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.efi \
       {{ netbootxyz_root }}/ipxe/{{ bootloader_filename }}.lkrn
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint

+ 2 - 6
roles/netbootxyz/tasks/generate_disks_legacy.yml

@@ -21,7 +21,7 @@
   when: generate_signatures | bool
 
 - name: Compile iPXE bootloader for Legacy BIOS
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
@@ -32,12 +32,10 @@
          bin/undionly.kpxe
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool == false
 
 - name: Compile iPXE bootloader for Legacy BIOS with debug flags
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
@@ -49,8 +47,6 @@
          bin/undionly.kpxe
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool
 
 - name: Copy iPXE files for Legacy BIOS to http directory

+ 2 - 6
roles/netbootxyz/tasks/generate_disks_linux.yml

@@ -25,19 +25,17 @@
   when: generate_signatures | bool
 
 - name: Compile iPXE Linux bootloader for Legacy BIOS
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin-x86_64-linux/slirp.linux
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool == false
 
 - name: Compile iPXE Linux bootloader for Legacy BIOS with debug flags
-  shell: |
+  ansible.builtin.shell: |
     make clean
     make EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
@@ -45,8 +43,6 @@
          bin-x86_64-linux/slirp.linux
   args:
     chdir: "{{ ipxe_source_dir }}/src"
-  tags:
-    - skip_ansible_lint
   when: ipxe_debug_enabled | bool
 
 - name: Copy iPXE linux binary for Legacy BIOS to http directory

+ 1 - 3
roles/netbootxyz/tasks/generate_disks_rpi.yml

@@ -49,12 +49,10 @@
     dest: "{{ pipxe_source_dir }}/Makefile"
 
 - name: Compile iPXE bootloader for RPI build
-  shell: |
+  ansible.builtin.shell: |
     make
   args:
     chdir: "{{ pipxe_source_dir }}"
-  tags:
-    - skip_ansible_lint
 
 - name: Copy iPXE RPI builds to http directory
   ansible.builtin.copy:

+ 3 - 5
roles/netbootxyz/tasks/generate_menus.yml

@@ -60,13 +60,11 @@
     - generate_version_file | bool
 
 - name: Generate netboot.xyz source files templates
-  template:
+  ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ netbootxyz_root }}/{{ item.path | regex_replace('.j2','') }}"
-  with_community.general.filetree: "templates/menu/"
+    dest: "{{ netbootxyz_root }}/{{ item.path | regex_replace('.j2', '') }}"
+  with_community.general.filetree: "{{ 'templates/menu/' }}"
   when: item.state == "file"
-  tags:
-    - skip_ansible_lint
 
 - name: Generate local-vars.ipxe if enabled
   ansible.builtin.template:

+ 2 - 4
roles/netbootxyz/tasks/generate_menus_custom.yml

@@ -9,10 +9,8 @@
     - "{{ netbootxyz_root }}/custom"
 
 - name: Generate custom user menu templates
-  template:
+  ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ netbootxyz_root }}/custom/{{ item.path | regex_replace('.j2','') }}"
+    dest: "{{ netbootxyz_root }}/custom/{{ item.path | regex_replace('.j2', '') }}"
   with_community.general.filetree: "{{ custom_templates_dir }}"
   when: item.state == "file"
-  tags:
-    - skip_ansible_lint

+ 2 - 6
roles/netbootxyz/tasks/generate_signatures.yml

@@ -1,9 +1,7 @@
 ---
 - name: Gather list of source files
-  command: ls {{ netbootxyz_root }}
+  ansible.builtin.command: ls {{ netbootxyz_root }}
   register: source_files
-  tags:
-    - skip_ansible_lint
 
 - name: Create directories for signatures
   ansible.builtin.file:
@@ -13,7 +11,7 @@
     - "{{ sigs_dir }}"
 
 - name: Generate signatures for source files
-  shell: |
+  ansible.builtin.shell: |
     openssl cms -sign -binary -noattr -in {{ netbootxyz_root }}/{{ item }} \
     -signer {{ codesign_cert_filename }} -inkey {{ codesign_key_filename }} -certfile {{ cert_file_filename }} -outform DER \
     -out {{ sigs_dir }}/{{ item }}.sig
@@ -22,5 +20,3 @@
     warn: false
   with_items:
     - "{{ source_files.stdout_lines }}"
-  tags:
-    - skip_ansible_lint

+ 1 - 0
roles/netbootxyz/templates/index.html.j2

@@ -16,6 +16,7 @@ exit
   <head>
     <title>{{ site_name }} BootLoaders - Powered by netboot.xyz</title>
     <meta name='description' content='Download links for available {{ site_name }} bootloaders.'>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <style>
       table, th, td {
       padding: 5px;

+ 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 oracle ${space} Oracle Linux
 item rhel ${space} Red Hat Enterprise Linux
 item rockylinux ${space} Rocky Linux
 item ubuntu ${space} Ubuntu

+ 15 - 0
roles/netbootxyz/templates/menu/live-mint.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Mint Live
 menu ${os}
 item --gap ${os} Versions
+item 21 ${space} ${os} 21
 item 20 ${space} ${os} 20
 item 19 ${space} ${os} 19
 item lmde ${space} ${os} LMDE
@@ -14,6 +15,14 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:21
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "mint" and 'squash' in key and '21' in value.version %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :20
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "mint" and 'squash' in key and '20' in value.version %}
@@ -57,6 +66,12 @@ goto {{ value.version }}-boot
 {% endif %}
 {% endfor %}
 
+:21-boot
+imgfree
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
+initrd ${kernel_url}initrd
+boot
+
 :20-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}

+ 6 - 4
roles/netbootxyz/templates/menu/oracle.ipxe.j2

@@ -8,6 +8,9 @@ goto ${menu} ||
 :oracle_menu
 set os Oracle Linux
 menu ${os}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch x86_64 ||
+iseq ${os_arch} arm64 && set os_arch aarch64 ||
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "oracle" %}
@@ -15,14 +18,13 @@ item {{ value.version }} ${space} ${os} {{ value.version }}
 {% endif %}
 {% endfor %}
 choose version || goto oracle_exit
-goto ${version}
-
+goto ${version}_${os_arch}
 
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "oracle" %}
-:{{ value.version }}
+:{{ value.version }}_{{ value.arch }}
 set url ${live_endpoint}{{ value.path }}
-set repo {{ releases.oracle.mirror }}{{ releases.oracle.paths[value.version|int] }}
+set repo {{ releases.oracle.mirror }}{{ releases.oracle.paths[value.version|int] }}/${os_arch}
 goto boot
 
 {% endif %}

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.60
+2.0.61