Merge pull request #1352 from netbootxyz/development

Release 2.0.75-RC

CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.75] - 2023-12-03
+
+### Fixed
+
+- Updated CentOS to be able to pull arm64 images
+- Updates to images that may have been missing curl in the
+  initrd for booting
+
+### Changed
+
+- Uses exit 1 on local boot now to allow for it to roll over
+  to next device in UEFI (Issue #1276)
+- Switches to using proxmox iso from asset releases so that it can
+  also be installed via local assets (Issue #1350)
+
 ## [2.0.74] - 2023-11-14
 
 ### Changed

README.md

@@ -176,7 +176,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Slackware | https://www.slackware.com | Yes | No |
 | SmartOS | https://www.joyent.com/smartos | Yes | No |
 | SparkyLinux | https://sparkylinux.org/ | No | Yes |
-| Tails | https://tails.boum.org/ | No | Yes |
+| Tails | https://tails.net | No | Yes |
 | Talos | https://www.talos.dev/ | Yes | No |
 | Tiny Core Linux | https://tinycorelinux.net | Yes | Yes |
 | Ubuntu | https://www.ubuntu.com | Yes | Yes |

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

@@ -20,8 +20,10 @@ item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
 isset ${osversion} || choose osversion || goto linux_menu
 echo ${cls}
-set dir ${centos_base_dir}/${osversion}/BaseOS/${os_arch}/os
-iseq ${osversion} 7 && set dir ${centos_base_dir}/${osversion}/os/${os_arch} ||
+iseq os_arch x86_64 && set dir ${centos_base_dir}/${osversion}/BaseOS/${os_arch}/os ||
+iseq os_arch aarch64 && set dir altarch/${osversion}/BaseOS/${os_arch}/os ||
+iseq os_arch x86_64 && iseq ${osversion} 7 && set dir ${centos_base_dir}/${osversion}/os/${os_arch} ||
+iseq os_arch aarch64 && iseq ${osversion} 7 && set dir altarch/${osversion}/os/${os_arch} ||
 set repo ${centos_mirror}/${dir}
 goto boottype
 

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

@@ -6,8 +6,11 @@ goto ${menu} ||
 set os BackBox
 menu ${os}
 item --gap ${os} Versions
-item 7 ${space} ${os} 7
-item 6 ${space} ${os} 6
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "BackBox" and 'squash' in key %}
+item {{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
 choose live_version || goto live_exit
 goto ${live_version}
 
@@ -21,17 +24,11 @@ set squash_url ${live_endpoint}{{ value.path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ value.path }}
 {% endif %}
 {% endfor %}
-goto {{ value.version }}-boot
+goto boot-os
 {% endif %}
 {% endfor %}
 
-:6-boot
-imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
-initrd ${kernel_url}initrd
-boot
-
-:7-boot
+:boot-os
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

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

@@ -7,12 +7,7 @@ set os Bodhi
 menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
-{% 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" %}
+{% if value.os == "bodhi" %}
 item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
 {% endif %}
 {% endfor %}
@@ -24,18 +19,12 @@ 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-{{ value.version }}
+goto boot-os
 
 {% endif %}
 {% endfor %}
 
-:boot-5
-imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
-initrd ${kernel_url}initrd
-boot
-
-:boot-6
+:boot-os
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd

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

@@ -104,7 +104,7 @@ goto main_menu
 
 :local
 echo Booting from local disks ...
-exit 0
+exit 1
 
 :shell
 echo Type "exit" to return to menu.

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

@@ -79,7 +79,7 @@ set proxmox_version {{ value.version }}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd http://download.proxmox.com/iso/proxmox-backup-server_${proxmox_version}.iso /proxmox.iso
+initrd ${kernel_url}proxmox.iso /proxmox.iso
 boot
 
 :boot-pmg
@@ -92,7 +92,7 @@ set proxmox_version {{ value.version }}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd http://download.proxmox.com/iso/proxmox-mailgateway_${proxmox_version}.iso /proxmox.iso
+initrd ${kernel_url}proxmox.iso /proxmox.iso
 boot
 
 :boot-pve
@@ -105,7 +105,7 @@ set proxmox_version {{ value.version }}
 imgfree
 kernel ${kernel_url}vmlinuz vga=791 video=vesafb:ywrap,mtrr ramdisk_size=16777216 rw quiet ${params} {{ kernel_params }}
 initrd ${kernel_url}initrd
-initrd http://download.proxmox.com/iso/proxmox-ve_${proxmox_version}.iso /proxmox.iso
+initrd ${kernel_url}proxmox.iso /proxmox.iso
 boot
 
 :proxmox_exit

version.txt

@@ -1 +1 @@
-2.0.74
+2.0.75