Collapse archlinux arch installs to one entity

roles/netbootxyz/defaults/main.yml

@@ -135,16 +135,7 @@ releases:
     versions:
     - code_name: current
       name: current
-  archlinux_32:
-    base_dir: pub/archlinux32
-    enabled: true
-    menu: linux
-    mirror: mirror.math.princeton.edu
-    name: Arch Linux 32-bit
-    versions:
-    - code_name: 2021.09.01
-      name: 2021.09.01
-  archlinux_64:
+  archlinux:
     base_dir: archlinux
     enabled: true
     menu: linux

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

@@ -8,8 +8,6 @@ set ipparam BOOTIF=${netX/mac} ip=dhcp
 set os_arch ${arch}
 iseq ${os_arch} x86_64 && set os_arch x86_64 ||
 iseq ${os_arch} i386 && set os_arch i686 ||
-iseq ${os_arch} i686 && set archlinux_mirror {{ releases.archlinux_32.mirror }} ||
-iseq ${os_arch} i686 && set archlinux_base_dir {{ releases.archlinux_32.base_dir }} ||
 set real_archlinux_mirror ${archlinux_mirror}
 goto goto_menu
 
@@ -24,23 +22,21 @@ set ipparam BOOTIF=${netX/mac} ip=${ip}::${gateway}:${netmask}
 goto ${menu} ||
 
 :archlinux
-set os {{ releases.archlinux_64.name }}
+set os {{ releases.archlinux.name }} - ${os_arch}
 clear arch_version
 menu ${os} - ${arch}
 item --gap Latest Releases
-{% for item in releases.archlinux_64.versions %}
-iseq ${os_arch} x86_64 && item {{ item.code_name }} ${space} ${os} {{ item.name }} ||
-{% endfor %}
-{% for item in releases.archlinux_32.versions %}
-iseq ${os_arch} i686 && item {{ item.code_name }} ${space} ${os} {{ item.name }} ||
+{% for item in releases.archlinux.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
 choose arch_version || goto archlinux_exit
-goto boot
+iseq ${os_arch} amd64 && goto boot ||
+iseq ${os_arch} i686 && goto boot32 ||
 
 :boot
 imgfree
 set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot
-set params archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ${ipparam} net.ifnames=0 ${cmdline} {{ kernel_params }}
+set params archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ${ipparam} net.ifnames=0q {{ kernel_params }}
 kernel http://${archlinux_mirror}/${dir}/${os_arch}/vmlinuz-linux ${params}
 initrd http://${archlinux_mirror}/${dir}/${os_arch}/initramfs-linux.img
 echo
@@ -49,6 +45,22 @@ md5sum vmlinuz-linux initramfs-linux.img
 boot
 goto archlinux_exit
 
+:boot32
+{% for key, value in endpoints.items() | sort %}
+{% if key == "archlinux-32" %}
+set arch32_url ${live_endpoint}{{ value.path }}
+{% endif %}
+{% endfor %}
+imgfree
+set params archiso_http_srv=${arch32_url} archisobasedir=arch verify=y ${ipparam} net.ifnames=0q {{ kernel_params }}
+kernel ${arch32_url}vmlinuz-linux ${ipparam} ${params}
+initrd ${arch32_url}initramfs-linux.img
+echo
+echo MD5sums:
+md5sum vmlinuz-linux initramfs-linux.img
+boot
+goto archlinux_exit
+
 :archlinux_exit
 clear menu
 exit 0