Merge pull request #904 from netbootxyz/development

Release 2.0.39-RC

.github/workflows/development.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - development
+  workflow_dispatch:
 
 env:
   DISCORD_HOOK_URL: ${{ secrets.DISCORD_HOOK_URL }}

.github/workflows/release-candidate.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - RC
+  workflow_dispatch:
 
 env:
   DISCORD_HOOK_URL: ${{ secrets.DISCORD_HOOK_URL }}

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.39]
+### Added
+- Enabled gzip and zlib support on iPXE binaries
+### Fixes
+- Check for legacy undionly filename if running menu locally
+
 ## [2.0.38]
 ### Added
 - Fedora 34 and Live Versions

endpoints.yml

@@ -467,7 +467,7 @@ endpoints:
     flavor: eoan
     kernel: voyager-eoan-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20210429-0945-92641c1f/
+    path: /ubuntu-squash/releases/download/20210513-1239-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-25-002d59cc/
+    path: /debian-squash/releases/download/2.7.2-30-002d59cc/
     files:
     - filesystem.squashfs
     - initrd
@@ -608,7 +608,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-ubuntu-stable
   clonezilla-ubuntu-testing:
-    path: /ubuntu-squash/releases/download/20210428-groovy-18e78f5f/
+    path: /ubuntu-squash/releases/download/20210511-groovy-18e78f5f/
     files:
     - filesystem.squashfs
     - initrd
@@ -631,7 +631,7 @@ endpoints:
     os: dban
     version: 2.3.0
   sparky-stable-mingui:
-    path: /debian-squash/releases/download/5.14-aedc6c8b/
+    path: /debian-squash/releases/download/5.15-aedc6c8b/
     files:
     - filesystem.squashfs
     - initrd
@@ -641,7 +641,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-stable-mingui
   sparky-stable-gui:
-    path: /debian-squash/releases/download/5.14-93b52633/
+    path: /debian-squash/releases/download/5.15-93b52633/
     files:
     - filesystem.squashfs
     - initrd
@@ -651,7 +651,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-stable-gui
   sparky-stable-lxqt:
-    path: /debian-squash/releases/download/5.14-c2782c91/
+    path: /debian-squash/releases/download/5.15-c2782c91/
     files:
     - filesystem.squashfs
     - initrd
@@ -681,7 +681,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-rolling-gui
   sparky-rolling-lxqt:
-    path: /debian-squash/releases/download/2021.03-5d8b15b7/
+    path: /debian-squash/releases/download/5.15-5d8b15b7/
     files:
     - filesystem.squashfs
     - initrd
@@ -796,7 +796,7 @@ endpoints:
     version: '2020.06'
     flavor: small
   gparted-stable:
-    path: /debian-squash/releases/download/1.2.0-1-1edbd7bd/
+    path: /debian-squash/releases/download/1.3.0-1-1edbd7bd/
     files:
     - filesystem.squashfs
     - initrd
@@ -844,7 +844,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.11.15-2021.04.19-a3024eea/
+    path: /asset-mirror/releases/download/5.12.1-2021.05.07-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -868,7 +868,7 @@ endpoints:
     os: zeninstall
     version: current
   gentoo:
-    path: /asset-mirror/releases/download/20210428T214503Z-8bb30d0c/
+    path: /asset-mirror/releases/download/20210512T214503Z-8bb30d0c/
     files:
     - image.squashfs
     - initrd
@@ -908,7 +908,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/21.0.1-210410-linux510-76684610/
+    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-e43aaf1e/
     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.1-210410-linux510-b5705833/
+    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-f8c7ddd8/
     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.1-210410-linux510-eef544a8/
+    path: /manjaro-squash/releases/download/21.0.3-210428-linux510-65731a47/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -970,7 +970,7 @@ endpoints:
     version: current
     flavor: full
   4mlinux-thesss:
-    path: /asset-mirror/releases/download/36.0-3ec6e844/
+    path: /asset-mirror/releases/download/36.1-3ec6e844/
     files:
     - initrd
     - vmlinuz
@@ -1706,3 +1706,28 @@ endpoints:
     - vmlinuz
     os: redorescue
     version: buster
+  bodhi-6-standard:
+    path: /ubuntu-squash/releases/download/6.0.0-3d0b9f4e/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: bodhi
+    version: '6'
+    flavor: standard
+  bodhi-6-apppack:
+    path: /ubuntu-squash/releases/download/6.0.0-3473cec1/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: bodhi
+    version: '6'
+    flavor: apppack
+  mfsbsd-13:
+    path: /asset-mirror/releases/download/13.0-e7f551e0/
+    files:
+    - default.img
+    - special-edition.img
+    os: freebsd
+    version: '13'

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

@@ -1,8 +1,10 @@
-#define CONSOLE_CMD		      /* Console command */
+#define CONSOLE_CMD           /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
-#define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */      
+#define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */
 #define IMAGE_COMBOOT         /* COMBOOT */
-#define IMAGE_TRUST_CMD	      /* Image trust management commands */
+#define IMAGE_TRUST_CMD       /* Image trust management commands */
+#define IMAGE_GZIP            /* GZIP image support */
+#define IMAGE_ZLIB            /* ZLIB image support */
 #define NET_PROTO_IPV6        /* IPv6 protocol */
 #define NSLOOKUP_CMD          /* DNS resolving command */
 #define NTP_CMD               /* NTP commands */

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

@@ -1,7 +1,9 @@
-#define CONSOLE_CMD		      /* Console command */
+#define CONSOLE_CMD           /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
-#define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */      
-#define IMAGE_TRUST_CMD	      /* Image trust management commands */
+#define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */
+#define IMAGE_TRUST_CMD       /* Image trust management commands */
+#define IMAGE_GZIP            /* GZIP image support */
+#define IMAGE_ZLIB            /* ZLIB image support */
 #define NET_PROTO_IPV6        /* IPv6 protocol */
 #define NSLOOKUP_CMD          /* DNS resolving command */
 #define NTP_CMD               /* NTP commands */

roles/netbootxyz/templates/disks/netboot.xyz.j2

@@ -23,6 +23,7 @@ prompt --key m --timeout 4000 Hit the ${bold}m${boldoff} key to open failsafe me
 echo
 dhcp || goto netconfig
 isset ${next-server} && iseq ${filename} {{ site_name }}.kpxe && goto tftpmenu ||
+isset ${next-server} && iseq ${filename} {{ site_name }}-undionly.kpxe && goto tftpmenu ||
 isset ${next-server} && iseq ${filename} {{ site_name }}.efi && goto tftpmenu ||
 isset ${next-server} && iseq ${filename} {{ site_name }}-snp.efi && goto tftpmenu ||
 isset ${next-server} && iseq ${filename} {{ site_name }}-snponly.efi && goto tftpmenu ||

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

@@ -8,7 +8,12 @@ menu ${os} - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "bodhi" %}
+{% if value.os == "bodhi" and value.version == "6" %}
+item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
+{% endif %}
+{% endfor %}
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "bodhi" and value.version == "5" %}
 item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
 {% endif %}
 {% endfor %}
@@ -21,17 +26,23 @@ goto ${live_version}
 :{{ value.version }}-{{ value.flavor }}
 set squash_url ${live_endpoint}{{ value.path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ value.path }}
-goto boot
+goto boot-{{ value.version }}
 
 {% endif %}
 {% endfor %}
 
-:boot
+:boot-5
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
 initrd ${kernel_url}initrd
 boot
 
+:boot-6
+imgfree
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+initrd ${kernel_url}initrd
+boot
+
 :live_exit
 clear menu
 exit 0

version.txt

@@ -1 +1 @@
-2.0.38
+2.0.39