diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-07-18 08:06:04 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-07-18 08:08:43 +0200 |
| commit | 1a899f7c1f6f4de5ac93fd4fbe30cd4d0696cbcd (patch) | |
| tree | 356486998d1ce212d4f62aed537c4a4e51b0509b | |
| parent | dev-ml/opam-installer: add 2.1.6 (diff) | |
| download | gentoo-1a899f7c1f6f4de5ac93fd4fbe30cd4d0696cbcd.tar.gz gentoo-1a899f7c1f6f4de5ac93fd4fbe30cd4d0696cbcd.tar.bz2 gentoo-1a899f7c1f6f4de5ac93fd4fbe30cd4d0696cbcd.zip | |
sys-kernel/linux-firmware: avoid mount-boot if ROOT is set
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
| -rw-r--r-- | sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild index eba1ddedc308..b7c47404963d 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild @@ -70,10 +70,10 @@ PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch ) pkg_pretend() { if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then + if 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 + [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -376,8 +376,8 @@ pkg_postinst() { done if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + if use dist-kernel; then + [[ -z ${ROOT} ]] && 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 diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 17a10c80a0fc..7635e488d909 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -68,10 +68,10 @@ QA_PREBUILT="*" pkg_pretend() { if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then + if 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 + [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -382,8 +382,8 @@ pkg_postinst() { done if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + if use dist-kernel; then + [[ -z ${ROOT} ]] && 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 |