Merge pull request #1265 from netbootxyz/development

.github/workflows/pull-requests.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install ansible ansible-lint
+        pip install ansible==7.6.0 ansible-lint==6.15.0
 
     - name: Syntax Check
       run: |

CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.70] - 2023-00-00
+
+### Added
+
+- Enabled CERT_CMD in iPXE
+- Added Debian 12
+- Disable pci scan option when loaded on ARM/EFI as command isn't supported
+- Building snp and snponly builds for Equinix Metal
+
+### Changed
+
+- Changed default Equinix Metal builds to use snp to ensure more stable start
+- Changed CentOS 9 Stream mirror due to it no longer working with iPXE
+
 ## [2.0.69] - 2023-05-07
 
 ### Added

README.md

@@ -193,8 +193,6 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Name       | URL                     | Type |
 |------------|-------------------------|------|
 | 4MLinux | https://4mlinux.com/ | Kernel/Initrd |
-| ALT Linux Rescue | https://en.altlinux.org/Rescue | ISO - Memdisk |
-| BakAndImgCD | https://bakandimgcd.4mlinux.com/ | Kernel/Initrd |
 | Boot Repair CD | https://sourceforge.net/projects/boot-repair-cd/ | LiveCD |
 | Breakin | http://www.advancedclustering.com/products/software/breakin/ | Kernel/Initrd |
 | CAINE | https://www.caine-live.net/ | LiveCD |
@@ -211,7 +209,6 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | ShredOS | https://github.com/PartialVolume/shredos.x86_64 | Kernel | 
 | Super Grub2 Disk | http://www.supergrubdisk.org | ISO - Memdisk |
 | System Rescue | https://system-rescue.org/ | LiveCD |
-| The Smallest Server Suite | https://thesss.4mlinux.com/ | Kernel/Initrd |
 | Ultimate Boot CD | http://www.ultimatebootcd.com | ISO - Memdisk |
 
 ### Stargazers over time

endpoints.yml

@@ -15,7 +15,7 @@ endpoints:
     flavor: GNOME
     kernel: ubuntu-18.04-live-kernel
   debian-10-live-kernel:
-    path: /debian-core-10/releases/download/10.12.0-cb83d5e9/
+    path: /debian-core-10/releases/download/10.13.0-960f6051/
     files:
     - initrd
     - vmlinuz
@@ -133,13 +133,13 @@ endpoints:
     flavor: mate
     kernel: debian-10-live-kernel
   kali-xfce-squash:
-    path: /debian-squash/releases/download/2023.1-aee4a172/
+    path: /debian-squash/releases/download/2023.2-aee4a172/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: kali
-    version: '2023.1'
+    version: '2023.2'
     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/20230504-0714-702c76ea/
+    path: /ubuntu-squash/releases/download/20230629-0719-702c76ea/
     files:
     - vmlinuz
     - filesystem.squashfs
     - initrd.lz
     os: neon
-    version: 20230504-0714
+    version: 20230629-0719
     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/6.6-a6d3bdfa/
+    path: /debian-squash/releases/download/7.0-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/6.6-60b64dd4/
+    path: /debian-squash/releases/download/7.0-60b64dd4/
     files:
     - filesystem.squashfs
     - initrd
@@ -371,7 +371,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-stable-gui
   sparky-stable-lxqt:
-    path: /debian-squash/releases/download/6.6-9084dcac/
+    path: /debian-squash/releases/download/7.0-9084dcac/
     files:
     - filesystem.squashfs
     - initrd
@@ -522,7 +522,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/6.3.1-2023.05.03-475894cd/
+    path: /asset-mirror/releases/download/6.3.9-2023.06.23-475894cd/
     files:
     - initrd
     - vmlinuz
@@ -578,7 +578,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/22.1.0-minimal-230421-linux61-fed9737f/
+    path: /manjaro-squash/releases/download/22.1.3-minimal-230529-linux61-fed9737f/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -591,7 +591,7 @@ endpoints:
     flavor: xfce
     kernel: manjaro-xfce-current
   manjaro-gnome-current:
-    path: /manjaro-squash/releases/download/22.1.0-minimal-230421-linux61-fe6d0899/
+    path: /manjaro-squash/releases/download/22.1.3-minimal-230529-linux61-fe6d0899/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -604,7 +604,7 @@ endpoints:
     flavor: gnome
     kernel: manjaro-gnome-current
   manjaro-kde-current:
-    path: /manjaro-squash/releases/download/22.1.0-minimal-230421-linux61-21a3c27c/
+    path: /manjaro-squash/releases/download/22.1.3-minimal-230529-linux61-21a3c27c/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -656,7 +656,7 @@ endpoints:
     version: current
     flavor: BakAndImg
   4mlinux-antivirus:
-    path: /asset-mirror/releases/download/42.0-1.0.1-21051633/
+    path: /asset-mirror/releases/download/43.0-1.0.1-21051633/
     files:
     - initrd
     - vmlinuz
@@ -993,7 +993,7 @@ endpoints:
     flavor: cinnamon
     kernel: debian-11-live-kernel
   debian-11-live-kernel:
-    path: /debian-core-11/releases/download/11.6.0-95ff084b/
+    path: /debian-core-11/releases/download/11.7.0-95ff084b/
     files:
     - initrd
     - vmlinuz
@@ -1016,7 +1016,7 @@ endpoints:
     flavor: core
     kernel: debian-11-live-kernel
   debian-11-kde-squash:
-    path: /debian-squash/releases/download/11.7.0-1ca621ea/
+    path: /debian-squash/releases/download/12.0.0-8ba8243d/
     files:
     - filesystem.squashfs
     os: debian
@@ -1040,13 +1040,13 @@ endpoints:
     flavor: mate
     kernel: debian-11-live-kernel
   debian-11-lxde-squash:
-    path: /debian-squash/releases/download/11.7.0-9b3c4c2b/
+    path: /debian-squash/releases/download/12.0.0-60fbf655/
     files:
     - filesystem.squashfs
     os: debian
-    version: '11'
+    version: 12.0.0
     flavor: lxde
-    kernel: debian-11-live-kernel
+    kernel: debian-12-live-kernel
   debian-11-lxqt-squash:
     path: /debian-squash/releases/download/11.7.0-27dada40/
     files:
@@ -1066,46 +1066,46 @@ endpoints:
     flavor: bullseye
     kernel: voyager-bullseye-squash
   memtest86:
-    path: /asset-mirror/releases/download/10.4-81ecc10e/
+    path: /asset-mirror/releases/download/10.5-81ecc10e/
     files:
     - memtest86-usb.img
     os: memtest86-free
-    version: '10.4'
+    version: '10.5'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20230501T170436Z-c0630a5f/
+    path: /asset-mirror/releases/download/20230619T170202Z-c0630a5f/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230501T170436Z
+    version: 20230619T170202Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20230430T234851Z-d29572ce/
+    path: /asset-mirror/releases/download/20230625T234657Z-d29572ce/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230430T234851Z
+    version: 20230625T234657Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20230430T170359Z-abe575fe/
+    path: /asset-mirror/releases/download/20230625T165009Z-abe575fe/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20230430T170359Z
+    version: 20230625T165009Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/5.12-29645174/
+    path: /asset-mirror/releases/download/5.14-29645174/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     os: tails
-    version: '5.12'
+    version: '5.14'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20230105-b073bf9a/
@@ -1149,13 +1149,13 @@ endpoints:
     version: 9.03
     arch: i686
   systemrescue-amd64:
-    path: /asset-mirror/releases/download/10.00-2016e3dd/
+    path: /asset-mirror/releases/download/10.01-2016e3dd/
     files:
     - airootfs.sfs
     - initrd
     - vmlinuz
     os: systemrescue
-    version: 10.0
+    version: 10.01
     arch: amd64
   shredos-i686:
     path: /asset-mirror/releases/download/0.34_32-bit_20221231-23a7674f/
@@ -1232,40 +1232,40 @@ endpoints:
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.1.0-19-1c3e1967/
+    path: /debian-squash/releases/download/3.1.1-6-1c3e1967/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.0-19
+    version: 3.1.1-6
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
   clonezilla-debian-testing-i686:
-    path: /debian-squash/releases/download/3.1.0-19-d77841f5/
+    path: /debian-squash/releases/download/3.1.1-6-d77841f5/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.0-19
+    version: 3.1.1-6
     flavor: testing
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20230413-lunar-4ef16ee0/
+    path: /ubuntu-squash/releases/download/20230629-mantic-4ef16ee0/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20230413-lunar
+    version: 20230629-mantic
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
   garuda-dr460nized-gaming:
-    path: /asset-mirror/releases/download/230319-111e3083/
+    path: /asset-mirror/releases/download/230501-111e3083/
     files:
     - amd_ucode.img
     - desktopfs.sfs
@@ -1277,7 +1277,7 @@ endpoints:
     - vmlinuz
     os: garuda
     flavor: dr460nized-gaming
-    version: 230319
+    version: 230501
   garuda-dr460nized:
     path: /asset-mirror/releases/download/230501-28ac5f81/
     files:
@@ -1433,21 +1433,21 @@ endpoints:
     flavor: kde-barebones
     version: 220329
   proxmox-backup-server:
-    path: /asset-mirror/releases/download/2.4-1-09769528/
+    path: /asset-mirror/releases/download/3.0-1-09769528/
     files:
     - initrd
     - proxmox-backup-server.iso
     - vmlinuz
     os: proxmox-backup-server
-    version: 2.4-1
+    version: 3.0-1
   proxmox-ve:
-    path: /asset-mirror/releases/download/7.4-1-9402a564/
+    path: /asset-mirror/releases/download/8.0-2-9402a564/
     files:
     - initrd
     - proxmox.iso
     - vmlinuz
     os: proxmox-ve
-    version: 7.4-1
+    version: 8.0-2
   proxmox-mailgateway:
     path: /asset-mirror/releases/download/7.3-1-5c9b0cd6/
     files:
@@ -1723,7 +1723,7 @@ endpoints:
     flavor: xfce
     kernel: mint-21-xfce-squash
   oracle-9-x86_64:
-    path: /asset-mirror/releases/download/U1-095d2d5d/
+    path: /asset-mirror/releases/download/U2-095d2d5d/
     files:
     - vmlinuz
     - initrd
@@ -1732,7 +1732,7 @@ endpoints:
     version: '9'
     arch: x86_64
   oracle-9-aarch64:
-    path: /asset-mirror/releases/download/U1-772e9a86/
+    path: /asset-mirror/releases/download/U2-772e9a86/
     files:
     - vmlinuz
     - initrd
@@ -2154,3 +2154,74 @@ endpoints:
     version: '23.04'
     flavor: kylin
     kernel: ubuntu-23.04-kylin-squash
+  debian-12-live-kernel:
+    path: /debian-core-12/releases/download/12.0.0-825b8b20/
+    files:
+    - initrd
+    - vmlinuz
+    os: debian
+    version: '12'
+  debian-12-default-squash:
+    path: /debian-squash/releases/download/12.0.0-07c46b7d/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: core
+    kernel: debian-12-live-kernel
+  debian-12-gnome-squash:
+    path: /debian-squash/releases/download/12.0.0-702d8308/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: gnome
+    kernel: debian-12-live-kernel
+  debian-12-cinnamon-squash:
+    path: /debian-squash/releases/download/12.0.0-11cf9de3/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: cinnamon
+    kernel: debian-12-live-kernel
+  debian-12-lxqt-squash:
+    path: /debian-squash/releases/download/12.0.0-19d86b60/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: lxqt
+    kernel: debian-12-live-kernel
+  debian-12-mate-squash:
+    path: /debian-squash/releases/download/12.0.0-3a5afa24/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: mate
+    kernel: debian-12-live-kernel
+  debian-12-lxde-squash:
+    path: /debian-squash/releases/download/12.0.0-3405e186/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: lxde
+    kernel: debian-12-live-kernel
+  debian-12-xfce-squash:
+    path: /debian-squash/releases/download/12.0.0-1eb5a4c8/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: xfce
+    kernel: debian-12-live-kernel
+  debian-12-kde-squash:
+    path: /debian-squash/releases/download/12.0.0-38c053c1/
+    files:
+    - filesystem.squashfs
+    os: debian
+    version: '12'
+    flavor: kde
+    kernel: debian-12-live-kernel

roles/netbootxyz/defaults/main.yml

@@ -127,6 +127,8 @@ 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
@@ -140,8 +142,8 @@ releases:
     mirror: http://dl-cdn.alpinelinux.org
     name: Alpine Linux
     versions:
-    - code_name: v3.17
-      name: '3.17'
+    - code_name: v3.18
+      name: '3.18'
     - code_name: edge
       name: Edge (development)
   anarchy:
@@ -158,8 +160,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2023.05.03
-      name: 2023.05.03
+    - code_name: 2023.07.01
+      name: 2023.07.01
   blackarch:
     enabled: true
     menu: linux
@@ -191,11 +193,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 38.20230414.3.0
+    - code_name: 38.20230609.3.0
       name: stable
-    - code_name: 38.20230430.2.1
+    - code_name: 38.20230625.2.0
       name: testing
-    - code_name: 38.20230430.1.0
+    - code_name: 38.20230625.1.0
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -206,15 +208,15 @@ releases:
     name: Debian
     versions:
       stable:
+      - code_name: bookworm
+        name: 12.0 (bookworm)
       - code_name: bullseye
         name: 11.0 (bullseye)
       - code_name: buster
         name: 10.0 (buster)
-      - code_name: stretch
-        name: 9.0 (stretch)
       testing:
-      - code_name: bookworm
-        name: bookworm (testing)
+      - code_name: trixie
+        name: trixie (testing)
       - code_name: sid
         name: sid (unstable)
   devuan:
@@ -291,8 +293,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.27-core174
-      name: 2.27 Core174
+    - code_name: 2.27-core175
+      name: 2.27 Core175
   k3os:
     enabled: true
     menu: linux
@@ -334,6 +336,8 @@ releases:
       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-unstable
       name: nixos-unstable
   openEuler:
@@ -358,6 +362,9 @@ releases:
     mirror: http://ftp.openbsd.org
     name: OpenBSD
     versions:
+    - code_name: '7.3'
+      image_ver: '73'
+      name: '7.3'
     - code_name: '7.2'
       image_ver: '72'
       name: '7.2'
@@ -395,6 +402,8 @@ releases:
     mirror: http://download.opensuse.org
     name: OpenSUSE
     versions:
+    - code_name: '15.5'
+      name: openSUSE Leap 15.5
     - code_name: '15.4'
       name: openSUSE Leap 15.4
     - code_name: '15.3'
@@ -429,6 +438,8 @@ 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
@@ -478,14 +489,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
-    - code_name: 20230504T000449Z
-      name: 20230504T000449Z
-    - code_name: 20230420T000908Z
-      name: 20230420T000908Z
-    - code_name: 20230406T001127Z
-      name: 20230406T001127Z
-    - code_name: 20230323T000605Z
-      name: 20230323T000605Z
+    - code_name: 20230629T053622Z
+      name: 20230629T053622Z
+    - code_name: 20230615T000418Z
+      name: 20230615T000418Z
+    - code_name: 20230601T000726Z
+      name: 20230601T000726Z
+    - code_name: 20230518T234918Z
+      name: 20230518T234918Z
   talos:
     enabled: true
     menu: linux

roles/netbootxyz/files/ipxe/local/general.h

@@ -1,3 +1,4 @@
+#define CERT_CMD              /* Certificate management commands */
 #define CONSOLE_CMD           /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
 #define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */

roles/netbootxyz/files/ipxe/local/general.h.efi

@@ -1,3 +1,4 @@
+#define CERT_CMD              /* Certificate management commands */
 #define CONSOLE_CMD           /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
 #define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */

roles/netbootxyz/tasks/generate_disks_arm.yml

@@ -68,13 +68,3 @@
     - {src: "bin-arm64-efi/ipxe.efi", dest: "{{ bootloader_filename }}-arm64.efi"}
     - {src: "bin-arm64-efi/snp.efi", dest: "{{ bootloader_filename }}-arm64-snp.efi"}
     - {src: "bin-arm64-efi/snponly.efi", dest: "{{ bootloader_filename }}-arm64-snponly.efi"}
-  when: bootloader_filename != "netboot.xyz-metal"
-
-- name: Copy iPXE arm64 EFI builds to http directory for Equinix Metal
-  ansible.builtin.copy:
-    src: "{{ ipxe_source_dir }}/src/{{ item.src }}"
-    dest: "{{ netbootxyz_root }}/ipxe/{{ item.dest }}"
-    remote_src: true
-  with_items:
-    - {src: "bin-arm64-efi/snp.efi", dest: "{{ bootloader_filename }}-arm64.efi"}
-  when: bootloader_filename == "netboot.xyz-metal"

roles/netbootxyz/tasks/generate_disks_efi.yml

@@ -27,7 +27,9 @@
 - name: Compile iPXE bootloader for EFI
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin-x86_64-efi/ipxe.efi \
          bin-x86_64-efi/snp.efi \
@@ -39,7 +41,9 @@
 - name: Compile iPXE bootloader for EFI with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin-x86_64-efi/ipxe.efi \
@@ -58,13 +62,3 @@
     - {src: "bin-x86_64-efi/ipxe.efi", dest: "{{ bootloader_filename }}.efi"}
     - {src: "bin-x86_64-efi/snp.efi", dest: "{{ bootloader_filename }}-snp.efi"}
     - {src: "bin-x86_64-efi/snponly.efi", dest: "{{ bootloader_filename }}-snponly.efi"}
-  when: bootloader_filename != "netboot.xyz-metal"
-
-- name: Copy iPXE EFI builds to http directory for Equinix Metal
-  ansible.builtin.copy:
-    src: "{{ ipxe_source_dir }}/src/{{ item.src }}"
-    dest: "{{ netbootxyz_root }}/ipxe/{{ item.dest }}"
-    remote_src: true
-  with_items:
-    - {src: "bin-x86_64-efi/ipxe.efi", dest: "{{ bootloader_filename }}.efi"}
-  when: bootloader_filename == "netboot.xyz-metal"

roles/netbootxyz/tasks/generate_disks_legacy.yml

@@ -23,7 +23,9 @@
 - name: Compile iPXE bootloader for Legacy BIOS
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin/ipxe.dsk \
          bin/ipxe.pdsk \
@@ -37,7 +39,9 @@
 - name: Compile iPXE bootloader for Legacy BIOS with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin/ipxe.dsk \

roles/netbootxyz/tasks/generate_disks_linux.yml

@@ -27,7 +27,9 @@
 - name: Compile iPXE Linux bootloader for Legacy BIOS
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          TRUST={{ trust_files }} \
          bin-x86_64-linux/slirp.linux
   args:
@@ -37,7 +39,9 @@
 - name: Compile iPXE Linux bootloader for Legacy BIOS with debug flags
   ansible.builtin.shell: |
     make clean
-    make EMBED={{ bootloader_filename }} \
+    make CROSS_COMPILE=x86_64-linux-gnu- \
+         ARCH=x86_64 \
+         EMBED={{ bootloader_filename }} \
          DEBUG={{ ipxe_debug_options }} \
          TRUST={{ trust_files }} \
          bin-x86_64-linux/slirp.linux

roles/netbootxyz/templates/menu/archlinux.ipxe.j2

@@ -36,7 +36,7 @@ iseq ${os_arch} i686 && goto boot32 ||
 :boot
 imgfree
 set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot
-set params archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ${ipparam} net.ifnames=0 {{ kernel_params }}
+set params archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch cms_verify=y ${ipparam} net.ifnames=0 {{ kernel_params }}
 kernel http://${archlinux_mirror}/${dir}/${os_arch}/vmlinuz-linux ${params}
 initrd http://${archlinux_mirror}/${dir}/${os_arch}/initramfs-linux.img
 echo

roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -53,6 +53,7 @@ set menu_bsd 1
 set menu_unix 1
 set menu_freedos 1
 set menu_live 1
+set menu_pci 1
 set menu_windows 1
 set menu_utils 1
 iseq ${arch} i386 && goto i386 ||
@@ -84,12 +85,14 @@ set menu_live_arm 1
 set menu_windows 0
 set menu_utils 0
 set menu_utils_arm 1
+set menu_pci 0
 iseq ${platform} efi && goto efi ||
 goto architectures_end
 :efi
 set menu_bsd 0
 set menu_freedos 0
 set menu_unix 0
+set menu_pci 0
 goto architectures_end
 :architectures_end
 goto clouds
@@ -115,20 +118,22 @@ goto clouds_end
 
 :metal_x86_64
 set cmdline console=ttyS1,115200n8
-iseq ${platform} efi && set ipxe_disk netboot.xyz-metal.efi || set ipxe_disk netboot.xyz-metal.kpxe
+iseq ${platform} efi && set ipxe_disk netboot.xyz-metal-snp.efi || set ipxe_disk netboot.xyz-metal.kpxe
 set menu_linux_i386 0
 set menu_freedos 0
 set menu_windows 0
+iseq ${platform} efi && set menu_pci 0 ||
 goto clouds_end
 
 :metal_arm64
 set cmdline console=ttyAMA0,115200
-set ipxe_disk netboot.xyz-metal-arm64.efi
+set ipxe_disk netboot.xyz-metal-arm64-snp.efi
 set menu_bsd 0
 set menu_freedos 0
 set menu_live 0
 set menu_windows 0
 set menu_utils 0
+set menu_pci 0
 goto clouds_end
 
 :clouds_end

roles/netbootxyz/templates/menu/centos.ipxe.j2

@@ -63,7 +63,7 @@ goto boottype
 
 :bootos_images
 imgfree
-iseq ${osversion} 9-stream && set centos_mirror http://mirror.stream.centos.org || 
+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 }}

roles/netbootxyz/templates/menu/live-debian.ipxe.j2

@@ -6,6 +6,7 @@ goto ${menu} ||
 set os Debian Live
 menu ${os}
 item --gap ${os} Versions
+item bookworm ${space} ${os} 12 (bookworm)
 item bullseye ${space} ${os} 11 (bullseye)
 item buster ${space} ${os} 10 (buster)
 choose live_version || goto live_exit
@@ -13,6 +14,14 @@ menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
+:bookworm
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "debian" and 'squash' in key and value.version == "12" %}
+item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
+{% endif %}
+{% endfor %}
+goto flavor_select
+
 :bullseye
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "debian" and 'squash' in key and value.version == "11" %}

roles/netbootxyz/templates/menu/menu.ipxe.j2

@@ -63,7 +63,7 @@ iseq ${menu_utils_arm} 1 && item utils-arm ${space} Utilities (arm64) ||
 item change_arch ${space} Architecture: ${arch}
 item shell ${space} iPXE shell
 item netinfo ${space} Network card info
-item lspci ${space} PCI Device List
+iseq ${menu_pci} 1 && item lspci ${space} PCI Device List ||
 item about ${space} About netboot.xyz
 {% if sigs_menu | bool %}
 item --gap Signature Checks:

roles/netbootxyz/vars/debian.yml

@@ -3,15 +3,18 @@ netbootxyz_packages:
   - apache2
   - binutils-dev
   - binutils-aarch64-linux-gnu
+  - binutils-x86-64-linux-gnu
   - dosfstools
   - figlet
   - gcc-aarch64-linux-gnu
+  - gcc-x86-64-linux-gnu
   - build-essential
   - genisoimage
   - git
   - isolinux
   - liblzma-dev
   - libslirp-dev
+  - mtools
   - syslinux
   - syslinux-common
   - toilet

roles/netbootxyz/vars/redhat.yml

@@ -8,6 +8,7 @@ netbootxyz_packages:
   - httpd
   - libslirp-devel
   - minizip-devel
+  - mtools
   - syslinux
   - xz-devel
   - make

roles/netbootxyz/vars/ubuntu.yml

@@ -3,15 +3,18 @@ netbootxyz_packages:
   - apache2
   - binutils-dev
   - binutils-aarch64-linux-gnu
+  - binutils-x86-64-linux-gnu
   - dosfstools
   - figlet
   - gcc-aarch64-linux-gnu
+  - gcc-x86-64-linux-gnu
   - build-essential
   - genisoimage
   - git
   - isolinux
   - liblzma-dev
   - libslirp-dev
+  - mtools
   - syslinux
   - syslinux-common
   - toilet

version.txt

@@ -1 +1 @@
-2.0.69
+2.0.70