فهرست منبع

Removing some old code and dropping Arch 32bit

Antony Messerli 7 سال پیش
والد
کامیت
a1eaf86b41
2فایلهای تغییر یافته به همراه4 افزوده شده و 6 حذف شده
  1. 4 5
      src/archlinux.ipxe
  2. 0 1
      src/menu.ipxe

+ 4 - 5
src/archlinux.ipxe

@@ -19,11 +19,10 @@ goto boot
 
 :boot
 imgfree
-iseq ${arch} i386 && set bootarch i686 || set bootarch x86_64
 set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot
 set params initrd=archiso.img archiso_http_srv=http://${archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ip=dhcp net.ifnames=0 ${console}
-kernel http://${archlinux_mirror}/${dir}/${bootarch}/vmlinuz ${params} initrd=archiso.img
-initrd http://${archlinux_mirror}/${dir}/${bootarch}/archiso.img
+kernel http://${archlinux_mirror}/${dir}/x86_64/vmlinuz ${params} initrd=archiso.img
+initrd http://${archlinux_mirror}/${dir}/x86_64/archiso.img
 echo
 echo MD5sums:
 md5sum vmlinuz archiso.img
@@ -31,8 +30,8 @@ iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
 :verify_sigs
 echo
 echo Checking signatures...
-imgverify vmlinuz ${sigs}${dir}/${bootarch}/vmlinuz.sig || goto error
-imgverify archiso.img ${sigs}${dir}/${bootarch}/archiso.img.sig || goto error
+imgverify vmlinuz ${sigs}${dir}/x86_64/vmlinuz.sig || goto error
+imgverify archiso.img ${sigs}${dir}/x86_64/archiso.img.sig || goto error
 echo Signatures verified!
 echo
 :skip_sigs

+ 0 - 1
src/menu.ipxe

@@ -35,7 +35,6 @@ isset ${ip} || dhcp || echo DHCP failed
 clear menu
 set space:hex 20:20
 set space ${space:string}
-iseq ${arch} i386 && set arch5 i586 || set arch5 ${arch}
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 menu ${site_name}
 item --gap Default: