Merge pull request #943 from netbootxyz/development

Release 2.0.42-RC

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.42]
+### Added
+- Debian 11 (Bullseye) ahead of release
+### Fixes
+- Gentoo more reliable, switches to initrd.magic to avoid modifying initrd
+- Fixes to Mint menu to populate options correctly
+- Cosmetic fixes to index.html.j2 tables
+
 ## [2.0.41]
 ### Added
 - Adds support for openEuler

endpoints.yml

@@ -36,7 +36,7 @@ endpoints:
     os: debian
     version: 9
   debian-10-default-squash:
-    path: /debian-squash/releases/download/10.8.0-9728909e/
+    path: /debian-squash/releases/download/10.10.0-9728909e/
     files:
     - filesystem.squashfs
     os: debian
@@ -467,7 +467,7 @@ endpoints:
     flavor: eoan
     kernel: voyager-eoan-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20210624-0945-92641c1f/
+    path: /ubuntu-squash/releases/download/20210729-0944-92641c1f/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -588,7 +588,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-debian-stable
   clonezilla-debian-testing:
-    path: /debian-squash/releases/download/2.7.2-39-002d59cc/
+    path: /debian-squash/releases/download/2.7.3-12-002d59cc/
     files:
     - filesystem.squashfs
     - initrd
@@ -608,7 +608,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-ubuntu-stable
   clonezilla-ubuntu-testing:
-    path: /ubuntu-squash/releases/download/20210701-hirsute-18e78f5f/
+    path: /ubuntu-squash/releases/download/20210727-hirsute-18e78f5f/
     files:
     - filesystem.squashfs
     - initrd
@@ -778,25 +778,25 @@ endpoints:
     version: current
     flavor: kde-security
   grml-full:
-    path: /debian-squash/releases/download/2020.06-2bebe0db/
+    path: /debian-squash/releases/download/2021.07-5f810440/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: grml
-    version: '2020.06'
+    version: '2021.07'
     flavor: full
   grml-small:
-    path: /debian-squash/releases/download/2020.06-bd769ea9/
+    path: /debian-squash/releases/download/2021.07-bacc221b/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: grml
-    version: '2020.06'
+    version: '2021.07'
     flavor: small
   gparted-stable:
-    path: /debian-squash/releases/download/1.3.0-1-1edbd7bd/
+    path: /debian-squash/releases/download/1.3.1-1-1edbd7bd/
     files:
     - filesystem.squashfs
     - initrd
@@ -812,7 +812,7 @@ endpoints:
     os: rescatux
     version: current
   systemrescue:
-    path: /asset-mirror/releases/download/8.03-29e43bb5/
+    path: /asset-mirror/releases/download/8.04-29e43bb5/
     files:
     - initrd
     - vmlinuz
@@ -844,7 +844,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.12.11-2021.06.17-a3024eea/
+    path: /asset-mirror/releases/download/5.13.4-2021.07.22-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -868,7 +868,7 @@ endpoints:
     os: zeninstall
     version: current
   gentoo:
-    path: /asset-mirror/releases/download/20210630T214504Z-8bb30d0c/
+    path: /asset-mirror/releases/download/20210725T170534Z-21ec62e4/
     files:
     - image.squashfs
     - initrd
@@ -908,7 +908,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-e43aaf1e/
+    path: /manjaro-squash/releases/download/21.0.7-210614-linux510-90108dca/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -921,7 +921,7 @@ endpoints:
     flavor: xfce
     kernel: manjaro-xfce-current
   manjaro-gnome-current:
-    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-f8c7ddd8/
+    path: /manjaro-squash/releases/download/21.0.7-210614-linux510-d9e9fd9b/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -934,7 +934,7 @@ endpoints:
     flavor: gnome
     kernel: manjaro-gnome-current
   manjaro-kde-current:
-    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-65731a47/
+    path: /manjaro-squash/releases/download/21.0.7-210614-linux510-01cd228f/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -954,7 +954,7 @@ endpoints:
     os: fatdog
     version: current
   raizo:
-    path: /debian-squash/releases/download/v12.21.06.06i-0aa6f3c9/
+    path: /debian-squash/releases/download/v12.21.07.17i-0aa6f3c9/
     files:
     - filesystem.squashfs
     - initrd
@@ -970,7 +970,7 @@ endpoints:
     version: current
     flavor: full
   4mlinux-thesss:
-    path: /asset-mirror/releases/download/36.1-3ec6e844/
+    path: /asset-mirror/releases/download/37.0-3ec6e844/
     files:
     - initrd
     - vmlinuz
@@ -978,7 +978,7 @@ endpoints:
     version: current
     flavor: TheSSS
   4mlinux-bakandimg:
-    path: /asset-mirror/releases/download/36.0-262576bf/
+    path: /asset-mirror/releases/download/37.0-262576bf/
     files:
     - initrd
     - vmlinuz
@@ -1004,16 +1004,6 @@ endpoints:
     version: current
     flavor: architect
     kernel: manjaro-default-current
-  mint-lmde-cinnamon:
-    path: /debian-squash/releases/download/4-21c17bcf/
-    files:
-    - filesystem.squashfs
-    - initrd
-    - vmlinuz
-    os: mint
-    version: lmde
-    flavor: Cinnamon
-    kernel: mint-lmde-cinnamon
   ubuntu-20.04-default-squash:
     path: /ubuntu-squash/releases/download/20.04.2.0-9bc4558b/
     files:
@@ -1221,36 +1211,6 @@ endpoints:
     os: lite
     version: '5'
     kernel: linux-lite-5-squash
-  mint-20-cinnamon-squash:
-    path: /ubuntu-squash/releases/download/20.1-370e63f1/
-    files:
-    - initrd
-    - vmlinuz
-    - filesystem.squashfs
-    os: mint
-    version: '20.1'
-    flavor: Cinnamon
-    kernel: mint-20-cinnamon-squash
-  mint-20-xfce-squash:
-    path: /ubuntu-squash/releases/download/20.1-86e174f9/
-    files:
-    - initrd
-    - vmlinuz
-    - filesystem.squashfs
-    os: mint
-    version: '20.1'
-    flavor: xfce
-    kernel: mint-20-xfce-squash
-  mint-20-mate-squash:
-    path: /ubuntu-squash/releases/download/20.1-d78ba60d/
-    files:
-    - initrd
-    - vmlinuz
-    - filesystem.squashfs
-    os: mint
-    version: '20.1'
-    flavor: mate
-    kernel: mint-20-mate-squash
   ubuntu-20.10-default-squash:
     path: /ubuntu-squash/releases/download/20.10-a8c24058/
     files:
@@ -1541,7 +1501,7 @@ endpoints:
     os: kodachi
     version: '8'
   shredos:
-    path: /asset-mirror/releases/download/v2020.05.011_x86-64_0.30.001-528aa8ce/
+    path: /asset-mirror/releases/download/v2020.05.012_x86-64_0.31-fa7b79b5/
     files:
     - shredos
     os: shredos
@@ -1690,7 +1650,7 @@ endpoints:
     version: 34
     flavor: KDE
   rescuezilla-focal:
-    path: /asset-mirror/releases/download/2.1.3-21d8490a/
+    path: /asset-mirror/releases/download/2.2-b2e9a0d2/
     files:
     - filesystem.squashfs
     - initrd
@@ -1699,7 +1659,7 @@ endpoints:
     version: focal
     kernel: rescuezilla-focal
   redorescue:
-    path: /asset-mirror/releases/download/3.0.2-cc0d71c0/
+    path: /asset-mirror/releases/download/3.0.2-369d1d23/
     files:
     - filesystem.squashfs
     - initrd
@@ -1749,3 +1709,43 @@ endpoints:
     version: '21.04'
     flavor: intel-amd
     kernel: pop-21.04-default-squash
+  mint-lmde-cinnamon-squash:
+    path: /debian-squash/releases/download/4-073d5d42/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: mint
+    version: lmde
+    flavor: Cinnamon
+    kernel: mint-lmde-cinnamon-squash
+  mint-20-mate-squash:
+    path: /ubuntu-squash/releases/download/20.2-50f38e57/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '20'
+    flavor: mate
+    kernel: mint-20-mate-squash
+  mint-20-xfce-squash:
+    path: /ubuntu-squash/releases/download/20.2-745b322d/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '20'
+    flavor: xfce
+    kernel: mint-20-xfce-squash
+  mint-20-cinnamon-squash:
+    path: /ubuntu-squash/releases/download/20.2-a90905ff/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '20'
+    flavor: Cinnamon
+    kernel: mint-20-cinnamon-squash

roles/netbootxyz/defaults/main.yml

@@ -126,7 +126,7 @@ releases:
     base_dir: archlinux
     enabled: true
     menu: linux
-    mirror: mirrors.evowise.com
+    mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
     - code_name: 2021.07.01
@@ -160,7 +160,7 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 34.20210611.3.0
+    - code_name: 34.20210711.3.0
       name: stable
   debian:
     archive_mirror: http://archive.debian.org
@@ -171,13 +171,15 @@ releases:
     name: Debian
     versions:
       stable:
+      - code_name: bullseye
+        name: 11.0 (bullseye)
       - code_name: buster
         name: 10.0 (buster)
       - code_name: stretch
         name: 9.0 (stretch)
       testing:
-      - code_name: bullseye
-        name: bullseye (testing)
+      - code_name: bookworm
+        name: bookworm (testing)
       - code_name: sid
         name: sid (unstable)
   devuan:
@@ -248,8 +250,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.25-core157
-      name: 2.25 Core157
+    - code_name: 2.25-core158
+      name: 2.25 Core158
   k3os:
     enabled: true
     menu: linux
@@ -410,14 +412,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
+    - code_name: 20210729T002724Z
+      name: 20210729T002724Z
+    - code_name: 20210715T010227Z
+      name: 20210715T010227Z
     - code_name: 20210701T204427Z
       name: 20210701T204427Z
     - code_name: 20210617T001230Z
       name: 20210617T001230Z
-    - code_name: 20210520T001536Z
-      name: 20210520T001536Z
-    - code_name: 20210508T051936Z
-      name: 20210508T051936Z
   talos:
     enabled: true
     menu: linux

roles/netbootxyz/templates/index.html.j2

@@ -39,9 +39,9 @@ exit
   <table style="width:100%">
     <!-- table header -->
     <tr>
-       <th> Type </th>
-       <th> Bootloader </th>
-       <th> Description </th>
+       <th style="width:10%;"> Type </th>
+       <th style="width:20%;"> Bootloader </th>
+       <th style="width:70%;"> Description </th>
     </tr>
     <!-- table rows -->
     {% for item in bootloaders.hybrid %}
@@ -59,9 +59,9 @@ exit
   <table style="width:100%">
     <!-- table header -->
     <tr>
-       <th> Type </th>
-       <th> Bootloader </th>
-       <th> Description </th>
+       <th style="width:10%;"> Type </th>
+       <th style="width:20%;"> Bootloader </th>
+       <th style="width:70%;"> Description </th>
     </tr>
     <!-- table rows -->
     {% for item in bootloaders.legacy %}
@@ -80,9 +80,9 @@ exit
   <table style="width:100%">
     <!-- table header -->
     <tr>
-       <th> Type </th>
-       <th> Bootloader </th>
-       <th> Description </th>
+       <th style="width:10%;"> Type </th>
+       <th style="width:20%;"> Bootloader </th>
+       <th style="width:70%;"> Description </th>
     </tr>
     <!-- table rows -->
     {% for item in bootloaders.uefi %}
@@ -101,9 +101,9 @@ exit
   <table style="width:100%">
     <!-- table header -->
     <tr>
-       <th> Type </th>
-       <th> Bootloader </th>
-       <th> Description </th>
+       <th style="width:10%;"> Type </th>
+       <th style="width:20%;"> Bootloader </th>
+       <th style="width:70%;"> Description </th>
     </tr>
     <!-- table rows -->
     {% for item in bootloaders.arm %}
@@ -122,9 +122,9 @@ exit
   <table style="width:100%">
     <!-- table header -->
     <tr>
-       <th> Type </th>
-       <th> Bootloader </th>
-       <th> Description </th>
+       <th style="width:10%;"> Type </th>
+       <th style="width:20%;"> Bootloader </th>
+       <th style="width:70%;"> Description </th>
     </tr>
     <!-- table rows -->
     {% for item in bootloaders.rpi %}

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

@@ -7,8 +7,6 @@
 set os {{ releases.gentoo.name }}
 menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
-item --gap Currently during boot you need to press ctrl+d/ctrl+c
-item --gap repeatedly when init hangs on starting a download
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "gentoo" %}
@@ -29,8 +27,9 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz ip=dhcp root=/dev/ram0 init=/linuxrc loop=/image.squashfs looptype=squashfs cdroot=1 real_root=/ fetch=${url}image.squashfs {{ kernel_params }}
+kernel ${url}vmlinuz ip=dhcp root=/dev/ram0 init=/linuxrc loop=/image.squashfs looptype=squashfs cdroot=1 {{ kernel_params }}
 initrd ${url}initrd
+initrd ${url}image.squashfs /image.squashfs
 boot
 
 :gentoo_exit

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

@@ -17,7 +17,7 @@ goto ${live_version}
 
 :20
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and value.version == "20" %}
+{% if value.os == "mint" and 'squash' in key and '20' in value.version %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
@@ -25,7 +25,7 @@ goto flavor_select
 
 :19
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and value.version == "19" %}
+{% if value.os == "mint" and 'squash' in key and '19' in value.version %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
@@ -33,7 +33,7 @@ goto flavor_select
 
 :lmde
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and value.version == "lmde" %}
+{% if value.os == "mint" and 'squash' in key and value.version == "lmde" %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}

version.txt

@@ -1 +1 @@
-2.0.41
+2.0.42