Skip to content

Commit 5fff482

Browse files
dvzrvjelly
authored andcommitted
Fix PXE netboot image names
templates/releng/archlinux.ipxe: Fix the naming of the initrd images. In a commit leading to archiso 46 [1] (image 2020-08-01) the way files are being copied in the build script has been made more generic. Due to this change the names of the provided PXE netboot images on the download servers have changed as well and stopped matching the files as provided in archweb's .ipxe template. Add amd-ucode.img as additional initird to be downloaded, verified and used. [1] https://gitlab.archlinux.org/archlinux/archiso/-/commit/47e11125e4672fc3448caefa6728439160daedd3
1 parent 227562a commit 5fff482

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

templates/releng/archlinux.ipxe

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,15 @@ goto main
124124
:boot
125125
echo Booting Arch Linux x86_64 ${release} from ${mirrorurl}
126126
echo
127-
kernel ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz || goto failed_download
128-
imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz.ipxe.sig || goto failed_verify
129-
initrd ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img || goto failed_download
130-
imgverify intel_ucode.img ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img.ipxe.sig || goto failed_verify
127+
kernel ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz-linux || goto failed_download
128+
imgverify vmlinuz-linux ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz-linux.ipxe.sig || goto failed_verify
129+
initrd ${mirrorurl}iso/${release}/arch/boot/amd-ucode.img || goto failed_download
130+
imgverify intel_ucode.img ${mirrorurl}iso/${release}/arch/boot/amd-ucode.img.ipxe.sig || goto failed_verify
131+
initrd ${mirrorurl}iso/${release}/arch/boot/intel-ucode.img || goto failed_download
132+
imgverify intel_ucode.img ${mirrorurl}iso/${release}/arch/boot/intel-ucode.img.ipxe.sig || goto failed_verify
131133
initrd ${mirrorurl}iso/${release}/arch/boot/x86_64/archiso.img || goto failed_download
132134
imgverify archiso.img ${mirrorurl}iso/${release}/arch/boot/x86_64/archiso.img.ipxe.sig || goto failed_verify
133-
imgargs vmlinuz initrd=intel_ucode.img initrd=archiso.img archiso_http_srv=${mirrorurl}iso/${release}/ archisobasedir=arch verify=y ${extrabootoptions}
135+
imgargs vmlinuz-linux initrd=amd-ucode.img initrd=intel-ucode.img initrd=archiso.img archiso_http_srv=${mirrorurl}iso/${release}/ archisobasedir=arch verify=y ${extrabootoptions}
134136
boot || goto failed_boot
135137

136138
:failed_download

0 commit comments

Comments
 (0)