diff options
| author | Marian Buschsieweke <marian.buschsieweke@ovgu.de> | 2017-06-28 08:41:28 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-26 12:21:45 +0000 |
| commit | 293a3358836efe6f732bbcede8068c6966c62b97 (patch) | |
| tree | f1254d765661acd08f6bdf31a4749a501416e384 | |
| parent | abe1dc5988d12f5aca771605b109390f33ce7519 (diff) | |
| download | aports-293a3358836efe6f732bbcede8068c6966c62b97.tar.bz2 aports-293a3358836efe6f732bbcede8068c6966c62b97.tar.xz | |
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
| -rw-r--r-- | main/syslinux/APKBUILD | 4 | ||||
| -rwxr-xr-x | main/syslinux/update-extlinux | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 94334a5ade..d8f380492e 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux pkgver=6.04_pre1 -pkgrel=1 +pkgrel=2 _ver=${pkgver/_/-} pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" @@ -57,4 +57,4 @@ package() { sha512sums="7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 syslinux-6.04-pre1.tar.xz c3ff809f9cd60aa8a837d9508e6fcd08204b03cd8a9df86ab42fc6a8fe68784416b359b46378fb0a8f4163bbcbe444957e0e5751c30ff4631d4677eaa94874f4 update-extlinux.conf -6b90164c5669744d1c3ba379d3d919bd16dfccb87e04ed5dcb6c324617fa0186840b359f5bb2d8515da3b26077b585050812755eb4e0b36e0e646dc7bcf024d2 update-extlinux" +5b76e00b06f2f21732858f48beb98ea4e6f04c0ec6e4f12092bc7c574bef04b5e01f595f3e9cb710935736fb419a8d2805d7d0d8695ef1b4179c2196f258a3f5 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 |