[arch-releng] [RFC][PATCH] [configs/releng] Always load intel-ucode in early boot stage

[Gerardo Exequiel Pozzi]

---
 configs/releng/build.sh                   | 2 ++
 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 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index ed2daba..c3314af 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
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%
-- 
2.1.2