sys-firmware/intel-microcode: complain less when /boot is not mounted

When using dist-kernel users can correct the problem and then
emerge --config ...

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/37292
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
This commit is contained in:
Andrew Ammerlaan
2024-06-25 16:36:46 +02:00
parent cfc3e2a936
commit 8da5d5cc4e
3 changed files with 45 additions and 18 deletions

View File

@@ -83,7 +83,15 @@ MICROCODE_SIGNATURES_DEFAULT=""
# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
pkg_pretend() {
use initramfs && mount-boot_pkg_pretend
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
# Check, but don't die because we can fix the problem and then
# emerge --config ... to re-run installation.
nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
fi
}
src_prepare() {
@@ -181,7 +189,7 @@ pkg_preinst() {
fi
# Make sure /boot is available if needed.
use initramfs && mount-boot_pkg_preinst
use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
local _initramfs_file="${ED}/boot/intel-uc.img"
@@ -274,21 +282,22 @@ pkg_preinst() {
pkg_prerm() {
# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
use initramfs && mount-boot_pkg_prerm
use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
}
pkg_postrm() {
# Don't forget to umount /boot if it was previously mounted by us.
use initramfs && mount-boot_pkg_postrm
use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
}
pkg_postinst() {
# Don't forget to umount /boot if it was previously mounted by us.
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
else
# Don't forget to umount /boot if it was previously mounted by us.
mount-boot_pkg_postinst
fi
mount-boot_pkg_postinst
fi
# We cannot give detailed information if user is affected or not:

View File

@@ -83,7 +83,15 @@ MICROCODE_SIGNATURES_DEFAULT=""
# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
pkg_pretend() {
use initramfs && mount-boot_pkg_pretend
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
# Check, but don't die because we can fix the problem and then
# emerge --config ... to re-run installation.
nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
fi
}
src_prepare() {
@@ -181,7 +189,7 @@ pkg_preinst() {
fi
# Make sure /boot is available if needed.
use initramfs && mount-boot_pkg_preinst
use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
local _initramfs_file="${ED}/boot/intel-uc.img"
@@ -274,21 +282,22 @@ pkg_preinst() {
pkg_prerm() {
# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
use initramfs && mount-boot_pkg_prerm
use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
}
pkg_postrm() {
# Don't forget to umount /boot if it was previously mounted by us.
use initramfs && mount-boot_pkg_postrm
use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
}
pkg_postinst() {
# Don't forget to umount /boot if it was previously mounted by us.
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
else
# Don't forget to umount /boot if it was previously mounted by us.
mount-boot_pkg_postinst
fi
mount-boot_pkg_postinst
fi
# We cannot give detailed information if user is affected or not:

View File

@@ -83,7 +83,15 @@ MICROCODE_SIGNATURES_DEFAULT=""
# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
pkg_pretend() {
use initramfs && mount-boot_pkg_pretend
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
# Check, but don't die because we can fix the problem and then
# emerge --config ... to re-run installation.
nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
fi
}
src_prepare() {
@@ -191,7 +199,7 @@ pkg_preinst() {
fi
# Make sure /boot is available if needed.
use initramfs && mount-boot_pkg_preinst
use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
local _initramfs_file="${ED}/boot/intel-uc.img"
@@ -284,21 +292,22 @@ pkg_preinst() {
pkg_prerm() {
# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
use initramfs && mount-boot_pkg_prerm
use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
}
pkg_postrm() {
# Don't forget to umount /boot if it was previously mounted by us.
use initramfs && mount-boot_pkg_postrm
use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
}
pkg_postinst() {
# Don't forget to umount /boot if it was previously mounted by us.
if use initramfs; then
if [[ -z ${ROOT} ]] && use dist-kernel; then
dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
else
# Don't forget to umount /boot if it was previously mounted by us.
mount-boot_pkg_postinst
fi
mount-boot_pkg_postinst
fi
# We cannot give detailed information if user is affected or not: