More arch cleanup

Moving to more consistent os_arch var and moving away from arch_a. Removing unused code where not being utilzed.
jackskhakis · Aug 29, 2021 · 560b758 · 560b758
1 parent ac66166
commit 560b758
Show file tree

Hide file tree

Showing 52 changed files with 77 additions and 126 deletions.
diff --git a/roles/netbootxyz/templates/menu/4mlinux.ipxe.j2 b/roles/netbootxyz/templates/menu/4mlinux.ipxe.j2
@@ -5,7 +5,6 @@ goto ${menu} ||
 :live_menu
 set os 4MLinux
 menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "4mlinux" %}
@@ -15,7 +14,6 @@ item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {
 choose version || goto exit
 goto ${version}
 
-
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "4mlinux" %}
 :{{ value.version }}-{{ value.flavor }}

diff --git a/roles/netbootxyz/templates/menu/bsd.ipxe.j2 b/roles/netbootxyz/templates/menu/bsd.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :bsd_menu
 
-menu BSD Installers - Current Selected Architecture [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu BSD Installers - Current Arch [ ${arch} ]
 
 # BSD based systems
 item --gap BSD Based Operating Systems
@@ -14,10 +13,6 @@ item --gap BSD Based Operating Systems
 item {{ key }} ${space} {{ value.name }}
 {% endif %}
 {% endfor %}
-# Options
-item --gap Options:
-iseq ${arch} x86_64 && set bits 64 || set bits 32
-item changebits ${space} Architecture: ${arch} (${bits}bit)
 choose menu || goto bsd_exit
 
 echo ${cls}
@@ -35,7 +30,3 @@ goto bsd_menu
 :bsd_exit
 clear menu
 exit 0
-
-:changebits
-iseq ${arch} x86_64 && set arch i386 || set arch x86_64
-goto bsd_menu
diff --git a/roles/netbootxyz/templates/menu/clonezilla.ipxe.j2 b/roles/netbootxyz/templates/menu/clonezilla.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Clonezilla
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item debian ${space} ${os} Debian Based
 item ubuntu ${space} ${os} Ubuntu Based

diff --git a/roles/netbootxyz/templates/menu/devuan.ipxe.j2 b/roles/netbootxyz/templates/menu/devuan.ipxe.j2
@@ -7,9 +7,10 @@ goto ${menu}
 
 :devuan
 set os Devuan
+iseq ${os_arch} x86_64 && set os_arch amd64 ||
 clear devuan_version
 clear older_release
-menu ${os} - ${arch_a}
+menu ${os} - ${os_arch}
 item --gap Latest Releases
 {% for item in releases.devuan.versions.stable %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -23,7 +24,7 @@ goto mirrorcfg
 
 :mirrorcfg
 set mirrorcfg mirror/suite=${devuan_version}
-set dir ${devuan_base_dir}/dists/${devuan_version}/main/installer-${arch_a}/current/images/netboot/
+set dir ${devuan_base_dir}/dists/${devuan_version}/main/installer-${os_arch}/current/images/netboot/
 goto devuan_boot_type
 
 :devuan_boot_type
@@ -53,11 +54,11 @@ set install_params auto=true priority=critical preseed/url=${preseedurl}
 goto devuan_text
 
 :devuan_text
-set dir ${dir}debian-installer/${arch_a}
+set dir ${dir}debian-installer/${os_arch}
 goto devuan_boot
 
 :devuan_graphical
-set dir ${dir}gtk/debian-installer/${arch_a}
+set dir ${dir}gtk/debian-installer/${os_arch}
 set install_params vga=788
 goto devuan_boot
 

diff --git a/roles/netbootxyz/templates/menu/endeavouros.ipxe.j2 b/roles/netbootxyz/templates/menu/endeavouros.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os EndeavourOS
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}

diff --git a/roles/netbootxyz/templates/menu/gentoo.ipxe.j2 b/roles/netbootxyz/templates/menu/gentoo.ipxe.j2
@@ -6,7 +6,6 @@
 :gentoo
 set os {{ releases.gentoo.name }}
 menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "gentoo" %}

diff --git a/roles/netbootxyz/templates/menu/gparted.ipxe.j2 b/roles/netbootxyz/templates/menu/gparted.ipxe.j2
@@ -5,7 +5,6 @@ goto ${menu} ||
 :live_menu
 set os GParted Live
 menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "gparted" %}

diff --git a/roles/netbootxyz/templates/menu/grml.ipxe.j2 b/roles/netbootxyz/templates/menu/grml.ipxe.j2
@@ -5,7 +5,6 @@ goto ${menu} ||
 :live_menu
 set os Grml
 menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "grml" %}

diff --git a/roles/netbootxyz/templates/menu/k3os.ipxe.j2 b/roles/netbootxyz/templates/menu/k3os.ipxe.j2
@@ -8,10 +8,12 @@ goto ${menu} ||
 
 :k3os
 set os {{ releases.k3os.name }}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch x86_64 ||
 set k3os_mirror {{ releases.k3os.mirror }}
 isset ${k3os_version} || set k3os_version latest
 isset ${k3os_install_device} || set k3os_install_device /dev/sda
-menu ${os} by Rancher - ${arch_a}
+menu ${os} by Rancher
 menu ${os} install
 item --gap k3OS:
 item k3os_boot ${space} Begin install ${os} ${k3os_version}
@@ -65,13 +67,13 @@ goto k3os
 :k3os_boot
 isset ${k3os_base_url} || set k3os_base_url ${k3os_mirror}/latest/download
 set install_params k3os.install.silent=true k3os.mode=install k3os.install.config_url=${k3os_config_url} k3os.install.device=${k3os_install_device}
-set boot_params printk.devkmsg=on k3os.install.iso_url=${k3os_base_url}/k3os-${arch_a}.iso console=ttyS0 console=tty1
+set boot_params printk.devkmsg=on k3os.install.iso_url=${k3os_base_url}/k3os-${os_arch}.iso console=ttyS0 console=tty1
 imgfree
-kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} {{ kernel_params }}
-initrd ${k3os_base_url}/k3os-initrd-${arch_a}
+kernel ${k3os_base_url}/k3os-vmlinuz-${os_arch} ${install_params} ${boot_params} {{ kernel_params }}
+initrd ${k3os_base_url}/k3os-initrd-${os_arch}
 echo
 echo MD5sums:
-md5sum k3os-vmlinuz-${arch_a} k3os-initrd-${arch_a}
+md5sum k3os-vmlinuz-${os_arch} k3os-initrd-${os_arch}
 boot
 
 :k3os_exit

diff --git a/roles/netbootxyz/templates/menu/kali.ipxe.j2 b/roles/netbootxyz/templates/menu/kali.ipxe.j2
@@ -7,14 +7,16 @@ goto ${menu} ||
 
 :kali
 set os {{ releases.kali.name }}
-menu ${os} - ${arch_a}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch amd64 ||
+menu ${os} - ${os_arch}
 {% for item in releases.kali.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
 choose version || goto kali_exit
 
 :deb_boot_type
-set dir ${kali_base_dir}/dists/kali-${version}/main/installer-${arch_a}/current/images/netboot
+set dir ${kali_base_dir}/dists/kali-${version}/main/installer-${os_arch}/current/images/netboot
 menu ${os} boot parameters
 item text ${os} text based install
 choose --default ${type} type || goto kali
@@ -23,7 +25,7 @@ echo ${cls}
 goto deb_${type}
 
 :deb_text
-set dir ${dir}/debian-installer/${arch_a}
+set dir ${dir}/debian-installer/${os_arch}
 goto deb_boot
 
 :deb_boot

diff --git a/roles/netbootxyz/templates/menu/kaspersky.ipxe.j2 b/roles/netbootxyz/templates/menu/kaspersky.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Kaspersky Rescue Disk
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "kaspersky" %}

diff --git a/roles/netbootxyz/templates/menu/linux-arm.ipxe.j2 b/roles/netbootxyz/templates/menu/linux-arm.ipxe.j2
@@ -3,7 +3,7 @@
 goto ${menu} ||
 
 :linux_menu
-menu Linux Installers - ARM ARCH **EXPERIMENTAL** Current Arch [ ${arch} ]
+menu Linux Installers - Current Arch [ ${arch} ]
 item --gap Popular Linux Operating Systems:
 item alpinelinux ${space} AlmaLinux
 item alpinelinux ${space} Alpine Linux

diff --git a/roles/netbootxyz/templates/menu/linux.ipxe.j2 b/roles/netbootxyz/templates/menu/linux.ipxe.j2
@@ -4,7 +4,6 @@ goto ${menu} ||
 
 :linux_menu
 menu Linux Installers - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap Linux Distros:
 {% for key, value in releases.items() | sort(attribute='1.name') %}
 {% if value.enabled is defined and value.menu == "linux" and value.enabled | bool %}

diff --git a/roles/netbootxyz/templates/menu/live-arm.ipxe.j2 b/roles/netbootxyz/templates/menu/live-arm.ipxe.j2
@@ -4,7 +4,6 @@ goto ${menu} ||
 
 :live_menu
 menu Live Boot Distributions - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap Live Boot Distributions
 item live-fedora ${space} Fedora
 choose menu || goto live_exit

diff --git a/roles/netbootxyz/templates/menu/live-backbox.ipxe.j2 b/roles/netbootxyz/templates/menu/live-backbox.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os BackBox
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item 7 ${space} ${os} 7
 item 6 ${space} ${os} 6

diff --git a/roles/netbootxyz/templates/menu/live-bluestar.ipxe.j2 b/roles/netbootxyz/templates/menu/live-bluestar.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Bluestar
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}

diff --git a/roles/netbootxyz/templates/menu/live-bodhi.ipxe.j2 b/roles/netbootxyz/templates/menu/live-bodhi.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Bodhi
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "bodhi" and value.version == "6" %}

diff --git a/roles/netbootxyz/templates/menu/live-debian.ipxe.j2 b/roles/netbootxyz/templates/menu/live-debian.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Debian Live
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item bullseye ${space} ${os} 11 (bullseye)
 item buster ${space} ${os} 10 (buster)

diff --git a/roles/netbootxyz/templates/menu/live-deepin.ipxe.j2 b/roles/netbootxyz/templates/menu/live-deepin.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Deepin
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "Deepin" %}

diff --git a/roles/netbootxyz/templates/menu/live-devuan.ipxe.j2 b/roles/netbootxyz/templates/menu/live-devuan.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Devuan
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "devuan" %}

diff --git a/roles/netbootxyz/templates/menu/live-elementary.ipxe.j2 b/roles/netbootxyz/templates/menu/live-elementary.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os elementary OS
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item elementaryos-6-default-squash ${space} ${os} 6
 choose live_version || goto live_exit

diff --git a/roles/netbootxyz/templates/menu/live-endeavouros.ipxe.j2 b/roles/netbootxyz/templates/menu/live-endeavouros.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os EndeavourOS
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}

diff --git a/roles/netbootxyz/templates/menu/live-fatdog.ipxe.j2 b/roles/netbootxyz/templates/menu/live-fatdog.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Fatdog64
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "fatdog" %}

diff --git a/roles/netbootxyz/templates/menu/live-fedora.ipxe.j2 b/roles/netbootxyz/templates/menu/live-fedora.ipxe.j2
@@ -7,8 +7,7 @@ goto ${menu} ||
 
 :live_menu
 set os Fedora Live
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for item in releases.fedora.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}

diff --git a/roles/netbootxyz/templates/menu/live-feren.ipxe.j2 b/roles/netbootxyz/templates/menu/live-feren.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Feren OS Live
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item current ${space} ${os} Current
 choose live_version || goto live_exit

diff --git a/roles/netbootxyz/templates/menu/live-k3os.ipxe.j2 b/roles/netbootxyz/templates/menu/live-k3os.ipxe.j2
@@ -4,9 +4,10 @@ goto ${menu} ||
 
 :live_menu
 set os {{ releases.k3os.name }}
+set os_arch ${arch}
+iseq ${os_arch} x86_64 && set os_arch x86_64 ||
 set k3os_mirror {{ releases.k3os.mirror }}
-menu ${os} by Rancher - ${arch_a}
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os} by Rancher
 isset ${k3os_version} || set k3os_version latest
 menu ${os} live
 item --gap k3OS live version:
@@ -51,8 +52,8 @@ isset ${k3os_base_url} || set k3os_base_url ${k3os_mirror}/latest/download
 set install_params k3os.mode=live
 set boot_params printk.devkmsg=on console=ttyS0 console=tty1
 imgfree
-kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} {{ kernel_params }}
-initrd ${k3os_base_url}/k3os-initrd-${arch_a}
+kernel ${k3os_base_url}/k3os-vmlinuz-${os_arch} ${install_params} ${boot_params} {{ kernel_params }}
+initrd ${k3os_base_url}/k3os-initrd-${os_arch}
 boot
 
 :live_exit

diff --git a/roles/netbootxyz/templates/menu/live-kali.ipxe.j2 b/roles/netbootxyz/templates/menu/live-kali.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Kali Linux
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 item rolling ${space} ${os} Rolling
 choose live_version || goto live_exit

diff --git a/roles/netbootxyz/templates/menu/live-kodachi.ipxe.j2 b/roles/netbootxyz/templates/menu/live-kodachi.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os Kodachi
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "kodachi" %}

diff --git a/roles/netbootxyz/templates/menu/live-lite.ipxe.j2 b/roles/netbootxyz/templates/menu/live-lite.ipxe.j2
@@ -4,9 +4,8 @@ goto ${menu} ||
 
 :live_menu
 set os Linux Lite
-menu ${os} - Current Arch [ ${arch} ]
+menu ${os}
 item --gap Use the username linuxlite with a blank password
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap ${os} Versions
 item 5 ${space} ${os} 5
 item 4 ${space} ${os} 4

diff --git a/roles/netbootxyz/templates/menu/live-lxle.ipxe.j2 b/roles/netbootxyz/templates/menu/live-lxle.ipxe.j2
@@ -4,8 +4,7 @@ goto ${menu} ||
 
 :live_menu
 set os LXLE
-menu ${os} - Current Arch [ ${arch} ]
-iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+menu ${os}
 item --gap ${os} Versions
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "lxle" %}