瀏覽代碼

Merge pull request #979 from netbootxyz/arch_labels

Add arch labels to linux menu
Antony Messerli 3 年之前
父節點
當前提交
4665752435
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 1 0
      roles/netbootxyz/templates/menu/boot.cfg.j2
  2. 3 3
      roles/netbootxyz/templates/menu/menu.ipxe.j2

+ 1 - 0
roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -114,6 +114,7 @@ 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

+ 3 - 3
roles/netbootxyz/templates/menu/menu.ipxe.j2

@@ -46,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 ||