From 293a3358836efe6f732bbcede8068c6966c62b97 Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Wed, 28 Jun 2017 08:41:28 +0200
Subject: main/syslinux: Changed update-extlinux to detect intel-ucode

If `/boot/intel-ucode.img` is present, update-extlinux will add it as
(first) INITRD. This way the microcode update in package non-free/intel-ucode
will be automatically loaded, if installed. This package fixes, among other
processor bugs, the hyper-threading bug in Intel Skylake and Kaby Lake
processers currently in the news [1]. More details here [2] and here [3].

[1] https://lists.debian.org/debian-devel/2017/06/msg00308.html
[2] https://wiki.archlinux.org/index.php/Microcode#Syslinux
[3] https://wiki.gentoo.org/wiki/Intel_microcode
---
 main/syslinux/update-extlinux | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'main/syslinux/update-extlinux')

diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
index 3ee258cd06..63c3fda27a 100755
--- a/main/syslinux/update-extlinux
+++ b/main/syslinux/update-extlinux
@@ -167,7 +167,18 @@ for kernel in $(find /boot -name "vmlinuz*" -type f); do
 	echo "  LINUX $(basename $kernel)" >> $conf.new
 	if [ -f "/boot/initramfs-$tag" ]; then
 		everbose "Found initramfs: /boot/initramfs-$tag"
-		echo "  INITRD initramfs-$tag" >> $conf.new
+		initrd="initramfs-$tag"
+		if [ -f "/boot/intel-ucode.img" ]; then
+			everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img"
+			initrd="intel-ucode.img,${initrd}"
+		fi
+		echo "  INITRD ${initrd}" >> $conf.new
+	else
+		if [ -f "/boot/intel-ucode.img" ]; then
+			everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img"
+			initrd="intel-ucode.img${initrd}"
+			echo "  INITRD intel-ucode.img" >> $conf.new
+		fi
 	fi
 	echo "  APPEND root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts" >> $conf.new
 	echo "" >> $conf.new
-- 
cgit v1.2.3