Merge pull request #1186 from netbootxyz/RC

Release 2.0.66

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.66] - 2022-12-28
+#### Fixed
+- Adjusted Mint menu generation for minor releases to fix rolling
+
 ## [2.0.65] - 2022-12-03
 #### Fixed
 - Removed deprecated arg from Ansible playbook to fix dev and rolling

endpoints.yml

@@ -141,13 +141,13 @@ endpoints:
     flavor: mate
     kernel: debian-10-live-kernel
   kali-xfce-squash:
-    path: /debian-squash/releases/download/2022.3-d818bd6f/
+    path: /debian-squash/releases/download/2022.4-d1c0d551/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: kali
-    version: '2022.3'
+    version: '2022.4'
     flavor: xfce
     kernel: kali-xfce-squash
   pop-19.10-default-squash:
@@ -389,7 +389,7 @@ endpoints:
     flavor: lxqt
     kernel: sparky-stable-lxqt
   sparky-rolling-mingui:
-    path: /debian-squash/releases/download/2022.10-1-3fe7c25a/
+    path: /debian-squash/releases/download/2022.12-3fe7c25a/
     files:
     - filesystem.squashfs
     - initrd
@@ -399,7 +399,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-rolling-mingui
   sparky-rolling-gui:
-    path: /debian-squash/releases/download/2022.10-1-b71f80ea/
+    path: /debian-squash/releases/download/2022.12-b71f80ea/
     files:
     - filesystem.squashfs
     - initrd
@@ -409,7 +409,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-rolling-gui
   sparky-rolling-lxqt:
-    path: /debian-squash/releases/download/2022.10-2-175022e7/
+    path: /debian-squash/releases/download/2022.12-175022e7/
     files:
     - filesystem.squashfs
     - initrd
@@ -530,7 +530,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/6.0.10-2022.11.27-2be14830/
+    path: /asset-mirror/releases/download/6.0.12-2-2022.12.13-2be14830/
     files:
     - initrd
     - vmlinuz
@@ -586,7 +586,7 @@ endpoints:
     os: septor
     version: current
   manjaro-xfce-current:
-    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-586f5150/
+    path: /manjaro-squash/releases/download/22.0-minimal-221224-linux61-586f5150/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -599,7 +599,7 @@ endpoints:
     flavor: xfce
     kernel: manjaro-xfce-current
   manjaro-gnome-current:
-    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-853d1b83/
+    path: /manjaro-squash/releases/download/22.0-minimal-221224-linux61-853d1b83/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -612,7 +612,7 @@ endpoints:
     flavor: gnome
     kernel: manjaro-gnome-current
   manjaro-kde-current:
-    path: /manjaro-squash/releases/download/21.3.7-minimal-220816-linux515-aa4ee4bd/
+    path: /manjaro-squash/releases/download/22.0-minimal-221224-linux61-aa4ee4bd/
     files:
     - livefs.sfs
     - rootfs.sfs
@@ -640,7 +640,7 @@ endpoints:
     os: raizo
     version: current
   4mlinux:
-    path: /asset-mirror/releases/download/40.1-fd5f6a2a/
+    path: /asset-mirror/releases/download/41.0-fd5f6a2a/
     files:
     - initrd
     - vmlinuz
@@ -807,7 +807,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/202212020318-63d59694/
+    path: /debian-squash/releases/download/202212230319-63d59694/
     files:
     - filesystem.squashfs
     - initrd
@@ -1003,7 +1003,7 @@ endpoints:
     flavor: Core
     kernel: zorin-16-core-squash
   debian-11-cinnamon-squash:
-    path: /debian-squash/releases/download/11.5.0-c360bf0e/
+    path: /debian-squash/releases/download/11.6.0-c360bf0e/
     files:
     - filesystem.squashfs
     os: debian
@@ -1011,14 +1011,14 @@ endpoints:
     flavor: cinnamon
     kernel: debian-11-live-kernel
   debian-11-live-kernel:
-    path: /debian-core-11/releases/download/11.3.0-0f2767cf/
+    path: /debian-core-11/releases/download/11.6.0-95ff084b/
     files:
     - initrd
     - vmlinuz
     os: debian
     version: '11'
   debian-11-gnome-squash:
-    path: /debian-squash/releases/download/11.5.0-267beed8/
+    path: /debian-squash/releases/download/11.6.0-267beed8/
     files:
     - filesystem.squashfs
     os: debian
@@ -1026,7 +1026,7 @@ endpoints:
     flavor: gnome
     kernel: debian-11-live-kernel
   debian-11-default-squash:
-    path: /debian-squash/releases/download/11.5.0-548b41fd/
+    path: /debian-squash/releases/download/11.6.0-548b41fd/
     files:
     - filesystem.squashfs
     os: debian
@@ -1034,7 +1034,7 @@ endpoints:
     flavor: core
     kernel: debian-11-live-kernel
   debian-11-kde-squash:
-    path: /debian-squash/releases/download/11.5.0-543e335a/
+    path: /debian-squash/releases/download/11.6.0-543e335a/
     files:
     - filesystem.squashfs
     os: debian
@@ -1042,7 +1042,7 @@ endpoints:
     flavor: kde
     kernel: debian-11-live-kernel
   debian-11-xfce-squash:
-    path: /debian-squash/releases/download/11.5.0-17bac385/
+    path: /debian-squash/releases/download/11.6.0-17bac385/
     files:
     - filesystem.squashfs
     os: debian
@@ -1050,7 +1050,7 @@ endpoints:
     flavor: xfce
     kernel: debian-11-live-kernel
   debian-11-mate-squash:
-    path: /debian-squash/releases/download/11.5.0-fb1b80ef/
+    path: /debian-squash/releases/download/11.6.0-fb1b80ef/
     files:
     - filesystem.squashfs
     os: debian
@@ -1058,7 +1058,7 @@ endpoints:
     flavor: mate
     kernel: debian-11-live-kernel
   debian-11-lxde-squash:
-    path: /debian-squash/releases/download/11.5.0-19e8aac8/
+    path: /debian-squash/releases/download/11.6.0-19e8aac8/
     files:
     - filesystem.squashfs
     os: debian
@@ -1066,7 +1066,7 @@ endpoints:
     flavor: lxde
     kernel: debian-11-live-kernel
   debian-11-lxqt-squash:
-    path: /debian-squash/releases/download/11.5.0-9f53ec11/
+    path: /debian-squash/releases/download/11.6.0-9f53ec11/
     files:
     - filesystem.squashfs
     os: debian
@@ -1084,11 +1084,11 @@ endpoints:
     flavor: bullseye
     kernel: voyager-bullseye-squash
   memtest86:
-    path: /asset-mirror/releases/download/10-d974f6fd/
+    path: /asset-mirror/releases/download/10.2-d974f6fd/
     files:
     - memtest86-usb.img
     os: memtest86-free
-    version: '10'
+    version: '10.2'
   gentoo-x86:
     path: /asset-mirror/releases/download/20221107T170540Z-c57f05ba/
     files:
@@ -1099,31 +1099,31 @@ endpoints:
     version: 20221107T170540Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20221123T141701Z-aca15d47/
+    path: /asset-mirror/releases/download/20221218T221711Z-aca15d47/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20221123T141701Z
+    version: 20221218T221711Z
     arch: arm64
   gentoo-amd64:
-    path: /asset-mirror/releases/download/20221122T220204Z-30785c7f/
+    path: /asset-mirror/releases/download/20221222T180220Z-30785c7f/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20221122T220204Z
+    version: 20221222T180220Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/5.7-562ab6e7/
+    path: /asset-mirror/releases/download/5.8-562ab6e7/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     os: tails
-    version: '5.7'
+    version: '5.8'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20211227-e37031e1/
@@ -1167,13 +1167,13 @@ endpoints:
     version: 9.03
     arch: i686
   systemrescue-amd64:
-    path: /asset-mirror/releases/download/9.05-1020d494/
+    path: /asset-mirror/releases/download/9.06-1020d494/
     files:
     - airootfs.sfs
     - initrd
     - vmlinuz
     os: systemrescue
-    version: 9.05
+    version: 9.06
     arch: amd64
   shredos-i686:
     path: /asset-mirror/releases/download/v2020.02.008_i686-0.30.001-39cc9ca5/
@@ -1190,13 +1190,13 @@ endpoints:
     version: v2021.08.2_21_x86-64_0.32.023
     arch: x86_64
   archlinux-32:
-    path: /asset-mirror/releases/download/2022.11.02-7d0ddaab/
+    path: /asset-mirror/releases/download/2022.12.02-7d0ddaab/
     files:
     - airootfs.sfs
     - initramfs-linux.img
     - vmlinuz-linux
     os: archlinux
-    version: 2022.11.02
+    version: 2022.12.02
     arch: i686
   q4os-4.6-default-squash:
     path: /debian-squash/releases/download/4.6-2de282e7/
@@ -1565,7 +1565,7 @@ endpoints:
     version: 5.0b1
     arch: amd64
   ubuntu-netboot-22.04-amd64:
-    path: /ubuntu-squash/releases/download/22.04.1-2f217c69/
+    path: /ubuntu-squash/releases/download/22.04.1-e4c114c4/
     files:
     - filesystem.squashfs
     - initrd
@@ -1802,33 +1802,33 @@ endpoints:
     version: 6.2
     kernel: linux-lite-6-squash
   mint-21-cinnamon-squash:
-    path: /ubuntu-squash/releases/download/21-c43dffe7/
+    path: /ubuntu-squash/releases/download/21.1-f8b6138b/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21'
+    version: '21.1'
     flavor: Cinnamon
     kernel: mint-21-cinnamon-squash
   mint-21-mate-squash:
-    path: /ubuntu-squash/releases/download/21-ec7437f8/
+    path: /ubuntu-squash/releases/download/21.1-124d6410/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21'
+    version: '21.1'
     flavor: mate
     kernel: mint-21-mate-squash
   mint-21-xfce-squash:
-    path: /ubuntu-squash/releases/download/21-435a7c58/
+    path: /ubuntu-squash/releases/download/21.1-a7cdf977/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21'
+    version: '21.1'
     flavor: xfce
     kernel: mint-21-xfce-squash
   oracle-9-x86_64:

roles/netbootxyz/defaults/main.yml

@@ -182,11 +182,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 37.20221106.3.0
+    - code_name: 37.20221211.3.0
       name: stable
-    - code_name: 37.20221127.2.0
+    - code_name: 37.20221225.2.1
       name: testing
-    - code_name: 37.20221127.1.0
+    - code_name: 37.20221225.1.1
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -467,14 +467,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
+    - code_name: 20221225T144337Z
+      name: 20221225T144337Z
+    - code_name: 20221215T000744Z
+      name: 20221215T000744Z
     - code_name: 20221201T010802Z
       name: 20221201T010802Z
     - code_name: 20221117T002317Z
       name: 20221117T002317Z
-    - code_name: 20221103T001803Z
-      name: 20221103T001803Z
-    - code_name: 20221020T001410Z
-      name: 20221020T001410Z
   talos:
     enabled: true
     menu: linux

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

@@ -18,25 +18,22 @@ set fg_whi ${esc:string}[37m
 :netabout
 menu ${fg_cya}${bold}About netboot.xyz (Version: ${version})
 item exit ${bold}Exit back to main menu...${boldoff}
-item --gap --  --------------------------------------------------------------------------
-item about ${fg_gre}${bold}Self Hosting and Live Booting - November 29, 2019
-item about ${fg_gre}${bold}Full Article: ${fg_whi}${bold}https://netboot.xyz/blog/
-item about
-item about ${fg_yel}${bold}* Self hosting options using Ansible and Docker (soon)
-item about ${fg_yel}${bold}* Live Boot options now available with more on the way
-item about ${fg_yel}${bold}${space}Allows you to PXE boot into a Live Desktop from Github
-item about ${fg_yel}${bold}* netboot.xyz repo moving to netbootxyz org on github
-item --gap --  --------------------------------------------------------------------------
+item --gap --  ${fg_whi}${bold}--Thanks------------------------------------------------------------------
+item about ${fg_gre}${bold}Thanks for your support and let us know how we can improve!
+item --gap --  ${fg_whi}${bold}--Twitter-----------------------------------------------------------------
 item about ${fg_cya}${bold}Follow us on Twitter: ${fg_whi}${bold}@netbootxyz
-item --gap --  --------------------------------------------------------------------------
-item about ${fg_gre}${bold}Join us on Discord: ${fg_whi}${bold}https://discord.gg/An6PA2a
-item --gap --  --------------------------------------------------------------------------
-item about ${fg_gre}${bold}Sponsorship: ${fg_whi}${bold}https://opencollective.com/netbootxyz
-item --gap --  --------------------------------------------------------------------------
+item --gap --  ${fg_whi}${bold}--Discord-----------------------------------------------------------------
+item about ${fg_mag}${bold}Join us on Discord: ${fg_whi}${bold}https://discord.gg/An6PA2a
+item --gap --  ${fg_whi}${bold}--Sponsorship-------------------------------------------------------------
+item about ${fg_gre}${bold}Open Collective: ${fg_whi}${bold}https://opencollective.com/netbootxyz
+item about ${fg_gre}${bold}Github Sponsors: ${fg_whi}${bold}https://github.com/sponsors/netbootxyz
+item --gap --  ${fg_whi}${bold}--Merch-------------------------------------------------------------------
+item about ${fg_gre}${bold}netboot.xyz store: ${fg_whi}${bold}https://store.netboot.xyz
+item --gap --  ${fg_whi}${bold}-----------------------------------------------------------------
 isset ${upstream_version} && goto display_version || goto skip_version
 :display_version
 iseq ${version} ${upstream_version} || item --gap --  ${fg_gre}${bold}Latest netboot.xyz version available: ${fg_whi}${bold}${upstream_version}
-item --gap --  --------------------------------------------------------------------------
+item --gap --  ${fg_whi}${bold}-----------------------------------------------------------------
 :skip_version
 choose selected || goto exit
 goto ${selected}
@@ -48,3 +45,4 @@ goto netabout
 :exit
 clear menu
 exit
+

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

@@ -62,7 +62,11 @@ set squash_url ${live_endpoint}{{ value.path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ value.path }}
 {% endif %}
 {% endfor %}
-goto {{ value.version }}-boot
+{% if value.version == "lmde" %}
+goto lmde-boot
+{% else %}
+goto {{ value.version | int }}-boot
+{% endif %}
 {% endif %}
 {% endfor %}
 

version.txt

@@ -1 +1 @@
-2.0.65
+2.0.66