Merge pull request #913 from netbootxyz/development

Release 2.0.40-RC

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.40]
+### Added
+- Adds support for VMware ESXi with user supplied media
+
 ## [2.0.39]
 ### Added
 - Enabled gzip and zlib support on iPXE binaries

README.md

@@ -153,6 +153,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Talos | https://www.talos.dev/ | Yes | No |
 | Tiny Core Linux | https://tinycorelinux.net | Yes | Yes |
 | Ubuntu | https://www.ubuntu.com | Yes | Yes |
+| VMware | https://www.vmware.com | User supplied media | No |
 | Voyager | https://voyagerlive.org | No | Yes |
 | VyOS | https://vyos.io | Yes | No |
 | Zen Installer | https://sourceforge.net/projects/revenge-installer | Yes | No |

endpoints.yml

@@ -327,7 +327,7 @@ endpoints:
     version: '5'
     kernel: elementaryos-5-default-squash
   kali-xfce-squash:
-    path: /debian-squash/releases/download/2021.1-4237c18c/
+    path: /debian-squash/releases/download/2021.2-4237c18c/
     files:
     - filesystem.squashfs
     - initrd
@@ -467,7 +467,7 @@ endpoints:
     flavor: eoan
     kernel: voyager-eoan-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20210513-1239-92641c1f/
+    path: /ubuntu-squash/releases/download/20210610-0944-92641c1f/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -578,7 +578,7 @@ endpoints:
     version: classic
     kernel: feren-classic-squash
   clonezilla-debian-stable:
-    path: /debian-squash/releases/download/2.7.1-22-fcb50247/
+    path: /debian-squash/releases/download/2.7.2-38-fcb50247/
     files:
     - filesystem.squashfs
     - initrd
@@ -588,7 +588,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-debian-stable
   clonezilla-debian-testing:
-    path: /debian-squash/releases/download/2.7.2-30-002d59cc/
+    path: /debian-squash/releases/download/2.7.2-39-002d59cc/
     files:
     - filesystem.squashfs
     - initrd
@@ -598,7 +598,7 @@ endpoints:
     flavor: testing
     kernel: clonezilla-debian-testing
   clonezilla-ubuntu-stable:
-    path: /ubuntu-squash/releases/download/20210127-groovy-2a768141/
+    path: /ubuntu-squash/releases/download/20210530-hirsute-2a768141/
     files:
     - filesystem.squashfs
     - initrd
@@ -608,7 +608,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-ubuntu-stable
   clonezilla-ubuntu-testing:
-    path: /ubuntu-squash/releases/download/20210511-groovy-18e78f5f/
+    path: /ubuntu-squash/releases/download/20210609-hirsute-18e78f5f/
     files:
     - filesystem.squashfs
     - initrd
@@ -742,7 +742,7 @@ endpoints:
     version: '2'
     flavor: ascii
   parrot-home-xfce:
-    path: /debian-squash/releases/download/4.11.1-d5797857/
+    path: /debian-squash/releases/download/4.11.2-d5797857/
     files:
     - filesystem.squashfs
     - initrd
@@ -751,7 +751,7 @@ endpoints:
     version: current
     flavor: xfce
   parrot-home-kde:
-    path: /debian-squash/releases/download/4.11.1-7919e8b1/
+    path: /debian-squash/releases/download/4.11.2-7919e8b1/
     files:
     - filesystem.squashfs
     - initrd
@@ -760,7 +760,7 @@ endpoints:
     version: current
     flavor: kde
   parrot-security-xfce:
-    path: /debian-squash/releases/download/4.11.1-b7440194/
+    path: /debian-squash/releases/download/4.11.2-b7440194/
     files:
     - filesystem.squashfs
     - initrd
@@ -844,7 +844,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.12.1-2021.05.07-a3024eea/
+    path: /asset-mirror/releases/download/5.12.6-2021.05.23-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -852,7 +852,7 @@ endpoints:
     os: bluestar
     version: current
   anarchy:
-    path: /asset-mirror/releases/download/1.3.2-b59f03e3/
+    path: /asset-mirror/releases/download/1.3.3-b59f03e3/
     files:
     - initrd
     - vmlinuz
@@ -868,7 +868,7 @@ endpoints:
     os: zeninstall
     version: current
   gentoo:
-    path: /asset-mirror/releases/download/20210512T214503Z-8bb30d0c/
+    path: /asset-mirror/releases/download/20210602T214502Z-8bb30d0c/
     files:
     - image.squashfs
     - initrd
@@ -900,7 +900,7 @@ endpoints:
     os: kaspersky
     version: '18'
   septor:
-    path: /debian-squash/releases/download/2021.2-cf4a4991/
+    path: /debian-squash/releases/download/2021.3-cf4a4991/
     files:
     - filesystem.squashfs
     - initrd
@@ -954,7 +954,7 @@ endpoints:
     os: fatdog
     version: current
   raizo:
-    path: /debian-squash/releases/download/v12.21.04.11p-0aa6f3c9/
+    path: /debian-squash/releases/download/v12.21.06.06i-0aa6f3c9/
     files:
     - filesystem.squashfs
     - initrd
@@ -962,7 +962,7 @@ endpoints:
     os: raizo
     version: current
   4mlinux:
-    path: /asset-mirror/releases/download/36.0-39ff9a19/
+    path: /asset-mirror/releases/download/36.1-39ff9a19/
     files:
     - initrd
     - vmlinuz
@@ -1492,7 +1492,7 @@ endpoints:
     flavor: gnome
     kernel: pureos-gnome
   rescuezilla:
-    path: /asset-mirror/releases/download/2.1.3-0d2fe010/
+    path: /asset-mirror/releases/download/2.2-3cfd948a/
     files:
     - filesystem.squashfs
     - initrd

roles/netbootxyz/defaults/main.yml

@@ -101,6 +101,8 @@ releases:
     versions:
     - code_name: 8.3
       name: 8.3
+    - code_name: 8.4
+      name: 8.4
   alpinelinux:
     base_dir: alpine
     enabled: true
@@ -142,8 +144,8 @@ releases:
     mirror: http://mirror.centos.org
     name: CentOS
     versions:
-    - code_name: 8.3.2011
-      name: '8.3'
+    - code_name: 8.4.2105
+      name: '8.4'
     - code_name: 8
       name: 8.x Latest
     - code_name: 8-stream
@@ -195,10 +197,10 @@ releases:
       - code_name: chimaera
         name: Chimaera (testing)
   fedora:
-    base_dir: pub/fedora/linux
+    base_dir: fedora
     enabled: true
     menu: linux
-    mirror: http://download.fedoraproject.org
+    mirror: http://mirrors.kernel.org
     name: Fedora
     versions:
     - code_name: 34
@@ -260,7 +262,7 @@ releases:
     name: Kali Linux
     versions:
     - code_name: rolling
-      name: Rolling Edition (2020.1)
+      name: Rolling Edition
   mageia:
     base_dir: mageia
     enabled: true
@@ -311,6 +313,8 @@ releases:
     mirror: http://download.opensuse.org
     name: OpenSUSE
     versions:
+    - code_name: '15.3'
+      name: openSUSE Leap 15.3
     - code_name: '15.2'
       name: openSUSE Leap 15.2
     - code_name: '15.1'
@@ -349,8 +353,8 @@ releases:
     mirror: http://download.rockylinux.org
     name: Rocky Linux
     versions:
-    - code_name: 8.3
-      name: 8.3
+    - code_name: 8.4
+      name: 8.4
   scientific:
     base_dir: linux/scientific
     enabled: true
@@ -540,6 +544,10 @@ releases:
       name: 18.04 LTS Bionic Beaver
     - code_name: xenial
       name: 16.04 LTS Xenial Xerus
+  vmware:
+    enabled: true
+    menu: linux
+    name: VMware ESXi
   vyos:
     enabled: true
     menu: linux

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

@@ -0,0 +1,68 @@
+#!ipxe
+
+# VMware ESXi
+# https://www.vmware.com
+
+goto ${menu} ||
+
+:vmware
+set os VMware ESXi
+clear vmware_choice
+menu ${os}
+item --gap Installers
+item vmware_install ${space} ${os} Install
+item --gap Options:
+item url_set ${space} Base URL [ ${vmware_base_url} ]
+choose vmware_choice || goto vmware_exit
+goto ${vmware_choice}
+
+:url_set
+echo Set the HTTP URL of an extracted VMware ISO without the trailing slash:
+echo e.g. http://www.mydomain.com/vmware/esxi7
+echo
+echo -n URL: ${} && read vmware_base_url
+echo
+echo The following files will be loaded the following files:
+echo
+echo For Legacy: ${vmware_base_url}/mboot.c32 
+echo For EFI: ${vmware_base_url}/efi/boot/bootx64.efi
+echo 
+echo The ESXi modules will be loaded from the following file:
+echo ${vmware_base_url}/boot.cfg
+echo
+echo Ensure you have edited boot.cfg to reflect the prefix of:
+echo
+echo prefix=${vmware_base_url}
+echo kernelopt=runweasel ks=${vmware_base_url}/ks.cfg
+echo 
+echo If you aren't doing kickstart automation, you can leave off the ks option.
+echo
+echo If the filenames in the kernel= and modules= lines begin with a forward
+echo slash (/) character, delete those characters.
+echo
+prompt Press any key to return to VMware Menu...
+goto vmware
+
+:vmware_install
+isset ${vmware_base_url} && goto boot_check || echo URL not set... && goto url_set
+:boot_check
+iseq ${platform} efi && goto efi_boot || goto legacy_boot
+
+:efi_boot
+imgfree
+kernel ${vmware_base_url}/efi/boot/bootx64.efi -c ${vmware_base_url}/boot.cfg
+goto boot
+
+:legacy_boot
+imgfree
+kernel ${vmware_base_url}/mboot.c32 -c ${vmware_base_url}/boot.cfg
+goto boot
+
+:boot
+md5sum bootx64.efi
+boot
+goto vmware
+
+:vmware_exit
+exit 0
+

version.txt

@@ -1 +1 @@
-2.0.39
+2.0.40