From d5ee91554befdc03777d9d36dfbf9549dae3ec9c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 29 Oct 2014 21:13:29 -0300 Subject: [configs/releng] Always load intel-ucode in early boot stage Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 4 ++++ configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf | 1 + configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 1 + configs/releng/syslinux/archiso_pxe32.cfg | 6 +++--- configs/releng/syslinux/archiso_pxe64.cfg | 6 +++--- configs/releng/syslinux/archiso_sys32.cfg | 2 +- configs/releng/syslinux/archiso_sys64.cfg | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) (limited to 'configs') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index ed2daba..8f402db 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -101,6 +101,8 @@ make_boot() { make_boot_extra() { cp ${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest cp ${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING + cp ${work_dir}/${arch}/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img + cp ${work_dir}/${arch}/airootfs/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE } # Prepare /${install_dir}/boot/syslinux @@ -164,6 +166,8 @@ make_efiboot() { cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img + cp ${work_dir}/iso/${install_dir}/boot/intel_ucode.img ${work_dir}/efiboot/EFI/archiso/intel_ucode.img + mkdir -p ${work_dir}/efiboot/EFI/boot cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index 9892c59..d503f11 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,4 +1,5 @@ title Arch Linux archiso x86_64 UEFI CD linux /EFI/archiso/vmlinuz.efi +initrd /EFI/archiso/intel_ucode.img initrd /EFI/archiso/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index f61c532..14f3d02 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,4 +1,5 @@ title Arch Linux archiso x86_64 UEFI USB linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/intel_ucode.img initrd /%INSTALL_DIR%/boot/x86_64/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg index 14f4aa3..aaa793e 100644 --- a/configs/releng/syslinux/archiso_pxe32.cfg +++ b/configs/releng/syslinux/archiso_pxe32.cfg @@ -5,7 +5,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (NBD) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/intel_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} SYSAPPEND 3 @@ -16,7 +16,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (NFS) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/intel_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt SYSAPPEND 3 @@ -27,6 +27,6 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) (HTTP) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/intel_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg index a1cf975..2598916 100644 --- a/configs/releng/syslinux/archiso_pxe64.cfg +++ b/configs/releng/syslinux/archiso_pxe64.cfg @@ -5,7 +5,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (NBD) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/intel_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} SYSAPPEND 3 @@ -16,7 +16,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (NFS) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/intel_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt SYSAPPEND 3 @@ -27,6 +27,6 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/intel_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys32.cfg index 43f839e..9d4d24b 100644 --- a/configs/releng/syslinux/archiso_sys32.cfg +++ b/configs/releng/syslinux/archiso_sys32.cfg @@ -5,5 +5,5 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/intel_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys64.cfg index 9d6c4de..2694968 100644 --- a/configs/releng/syslinux/archiso_sys64.cfg +++ b/configs/releng/syslinux/archiso_sys64.cfg @@ -5,5 +5,5 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/intel_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% -- cgit v1.2.3-54-g00ecf