فهرست منبع

Merge pull request #1009 from netbootxyz/arch-32

Arch 32-bit tweaks
Antony Messerli 3 سال پیش
والد
کامیت
cc33c12f4d
1فایلهای تغییر یافته به همراه14 افزوده شده و 6 حذف شده
  1. 14 6
      roles/netbootxyz/templates/menu/archlinux.ipxe.j2

+ 14 - 6
roles/netbootxyz/templates/menu/archlinux.ipxe.j2

@@ -5,6 +5,11 @@
 
 isset ${dhcp-server} || goto static_ip
 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
 
@@ -19,12 +24,15 @@ set ipparam BOOTIF=${netX/mac} ip=${ip}::${gateway}:${netmask}
 goto ${menu} ||
 
 :archlinux
-set os {{ releases.archlinux.name }}
+set os {{ releases.archlinux_64.name }}
 clear arch_version
 menu ${os} - ${arch}
 item --gap Latest Releases
-{% for item in releases.archlinux.versions %}
-item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% 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 }} ||
 {% endfor %}
 choose arch_version || goto archlinux_exit
 goto boot
@@ -32,9 +40,9 @@ goto boot
 :boot
 imgfree
 set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot
-set params initrd=initramfs-linux.img archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ${ipparam} net.ifnames=0 ${cmdline}
-kernel http://${archlinux_mirror}/${dir}/x86_64/vmlinuz-linux ${params} {{ kernel_params }}
-initrd http://${archlinux_mirror}/${dir}/x86_64/initramfs-linux.img
+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 }}
+kernel http://${archlinux_mirror}/${dir}/${os_arch}/vmlinuz-linux ${params}
+initrd http://${archlinux_mirror}/${dir}/${os_arch}/initramfs-linux.img
 echo
 echo MD5sums:
 md5sum vmlinuz-linux initramfs-linux.img