commit: 6214198d6596fbf6b172d57d0ee824cf0b25dea8
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 6 17:42:05 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 6 20:25:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6214198d
sys-kernel/linux-firmware: drop left over -z ROOT condition
This we don't need any more since dist-kernel_reinstall_initramfs already
does the appropriate checks.
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild | 6 +++---
sys-kernel/linux-firmware/linux-firmware-20241110.ebuild | 6 +++---
sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild | 6 +++---
sys-kernel/linux-firmware/linux-firmware-20241210.ebuild | 6 +++---
sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
b/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
index a631c9c507f1..6d307d60b2c3 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241017-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -83,7 +83,7 @@ pkg_pretend() {
if use dist-kernel; then
# Check, but don't die because we can fix the problem
and then
# emerge --config ... to re-run installation.
- [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+ nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
@@ -388,7 +388,7 @@ pkg_postinst() {
if use initramfs; then
if use dist-kernel; then
- [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs
"${KV_DIR}" "${KV_FULL}"
+ 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-20241110.ebuild
b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
index e9871c3b719c..c9ea9c688a9a 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -82,7 +82,7 @@ pkg_pretend() {
if use dist-kernel; then
# Check, but don't die because we can fix the problem
and then
# emerge --config ... to re-run installation.
- [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+ nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
@@ -387,7 +387,7 @@ pkg_postinst() {
if use initramfs; then
if use dist-kernel; then
- [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs
"${KV_DIR}" "${KV_FULL}"
+ 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-20241210-r1.ebuild
b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
index 4f68f0a8809f..ec4a3c1f8df9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -82,7 +82,7 @@ pkg_pretend() {
if use dist-kernel; then
# Check, but don't die because we can fix the problem
and then
# emerge --config ... to re-run installation.
- [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+ nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
@@ -387,7 +387,7 @@ pkg_postinst() {
if use initramfs; then
if use dist-kernel; then
- [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs
"${KV_DIR}" "${KV_FULL}"
+ 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-20241210.ebuild
b/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild
index e9871c3b719c..c9ea9c688a9a 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -82,7 +82,7 @@ pkg_pretend() {
if use dist-kernel; then
# Check, but don't die because we can fix the problem
and then
# emerge --config ... to re-run installation.
- [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+ nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
@@ -387,7 +387,7 @@ pkg_postinst() {
if use initramfs; then
if use dist-kernel; then
- [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs
"${KV_DIR}" "${KV_FULL}"
+ 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 2e4486362db9..2931f5f88e0d 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -81,7 +81,7 @@ pkg_pretend() {
if use dist-kernel; then
# Check, but don't die because we can fix the problem
and then
# emerge --config ... to re-run installation.
- [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
+ nonfatal mount-boot_check_status
else
mount-boot_pkg_pretend
fi
@@ -381,7 +381,7 @@ pkg_postinst() {
if use initramfs; then
if use dist-kernel; then
- [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs
"${KV_DIR}" "${KV_FULL}"
+ 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
