Merge pull request #982 from netbootxyz/development

Release 2.0.47-RC

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.47] - 2021-08-30
+#### Fixes
+- Corrects an issue with loading 32-bit linux menu on 64-bit platforms (https://github.com/netbootxyz/netboot.xyz/issues/978)
+
 ## [2.0.46] - 2021-08-29
 #### Fixes
 - Fix incorrect arch introduced on Ubuntu

roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -55,11 +55,12 @@ set menu_freedos 1
 set menu_live 1
 set menu_windows 1
 set menu_utils 1
-iseq ${buildarch} i386 && goto i386 ||
-iseq ${buildarch} x86_64 && goto x86_64 ||
-iseq ${buildarch} arm64 && goto arm64 ||
+iseq ${arch} i386 && goto i386 ||
+iseq ${arch} x86_64 && goto x86_64 ||
+iseq ${arch} arm64 && goto arm64 ||
 goto architectures_end
 :x86_64
+set menu_linux_i386 0
 iseq ${platform} efi && goto efi ||
 goto architectures_end
 :i386
@@ -106,14 +107,15 @@ set cmdline console=ttyS0,115200n8
 goto clouds_end
 
 :packet
-iseq ${buildarch} i386 && goto packet_x86_64 ||
-iseq ${buildarch} x86_64 && goto packet_x86_64 ||
-iseq ${buildarch} arm64 && goto packet_arm64 ||
+iseq ${arch} i386 && goto packet_x86_64 ||
+iseq ${arch} x86_64 && goto packet_x86_64 ||
+iseq ${arch} arm64 && goto packet_arm64 ||
 goto clouds_end
 
 :packet_x86_64
 set cmdline console=ttyS1,115200n8
 iseq ${platform} efi && set ipxe_disk netboot.xyz-packet.efi || set ipxe_disk netboot.xyz-packet.kpxe
+set menu_linux_i386 0
 set menu_freedos 0
 set menu_windows 0
 goto clouds_end

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

@@ -4,6 +4,10 @@
 {%- endif %}
 
 :start
+isset ${arch} && goto skip_arch_detect ||
+cpuid --ext 29 && set arch x86_64 || set arch i386
+iseq ${buildarch} arm64 && set arch arm64 ||
+:skip_arch_detect
 chain --autofree boot.cfg ||
 echo Attempting to retrieve latest upstream version number...
 chain --timeout 5000 https://boot.netboot.xyz/version.ipxe ||
@@ -31,12 +35,7 @@ chain --autofree http://${boot_domain}/ipxe/${ipxe_disk} ||
 :version_up2date
 {% endif %}
 
-isset ${arch} && goto skip_arch_detect ||
-cpuid --ext 29 && set arch x86_64 || set arch i386
-iseq ${buildarch} arm64 && set arch arm64 ||
-:skip_arch_detect
 isset ${menu} && goto ${menu} ||
-
 isset ${ip} || dhcp
 
 :main_menu
@@ -47,9 +46,9 @@ isset ${next-server} && menu ${site_name} v${version} - next-server: ${next-serv
 item --gap Default:
 item local ${space} Boot from local hdd
 item --gap Distributions:
-iseq ${menu_linux} 1 && item linux ${space} Linux Network Installs ||
-iseq ${menu_linux_i386} 1 && item linux-i386 ${space} Linux Network Installs ||
-iseq ${menu_linux_arm} 1 && item linux-arm ${space} Linux Network Installs ||
+iseq ${menu_linux} 1 && item linux ${space} Linux Network Installs (64-bit) ||
+iseq ${menu_linux_i386} 1 && item linux-i386 ${space} Linux Network Installs (32-bit) ||
+iseq ${menu_linux_arm} 1 && item linux-arm ${space} Linux Network Installs (arm64) ||
 iseq ${menu_live} 1 && item live ${space} Live CDs ||
 iseq ${menu_live_arm} 1 && item live-arm ${space} Live CDs ||
 iseq ${menu_bsd} 1 && item bsd ${space} BSD Installs ||

version.txt

@@ -1 +1 @@
-2.0.46
+2.0.47