From 5a8858906b9338ab459a7a6640c24695c8abfa2d Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 13 Jan 2021 15:14:06 +0100
Subject: kernel-install.eclass: Improve failed install error messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Support and use nonfatal to provide a detailed error message when kernel
postinst fails, in particular the correct 'emerge --config' command.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/dist-kernel-utils.eclass |  4 ++--
 eclass/kernel-install.eclass    | 43 ++++++++++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'eclass')

diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass
index d92642a25a0a..d65dc0924b40 100644
--- a/eclass/dist-kernel-utils.eclass
+++ b/eclass/dist-kernel-utils.eclass
@@ -43,7 +43,7 @@ dist-kernel_build_initramfs() {
 
 	ebegin "Building initramfs via dracut"
 	dracut --force "${output}" "${version}"
-	eend ${?} || die "Building initramfs failed"
+	eend ${?} || die -n "Building initramfs failed"
 }
 
 # @FUNCTION: dist-kernel_get_image_path
@@ -89,7 +89,7 @@ dist-kernel_install_kernel() {
 	# note: .config is taken relatively to System.map;
 	# initrd relatively to bzImage
 	installkernel "${version}" "${image}" "${map}"
-	eend ${?} || die "Installing the kernel failed"
+	eend ${?} || die -n "Installing the kernel failed"
 }
 
 # @FUNCTION: dist-kernel_reinstall_initramfs
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index cfd8ec0b7c58..0870999fa5ad 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -343,20 +343,37 @@ kernel-install_install_all() {
 	[[ ${#} -eq 1 ]] || die "${FUNCNAME}: invalid arguments"
 	local ver=${1}
 
-	mount-boot_pkg_preinst
-
-	local image_path=$(dist-kernel_get_image_path)
-	if use initramfs; then
-		# putting it alongside kernel image as 'initrd' makes
-		# kernel-install happier
-		dist-kernel_build_initramfs \
-			"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
-			"${ver}"
-	fi
+	local success=
+	# not an actual loop but allows error handling with 'break'
+	while :; do
+		mount-boot_pkg_preinst
+
+		local image_path=$(dist-kernel_get_image_path)
+		if use initramfs; then
+			# putting it alongside kernel image as 'initrd' makes
+			# kernel-install happier
+			nonfatal dist-kernel_build_initramfs \
+				"${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" \
+				"${ver}" || break
+		fi
 
-	dist-kernel_install_kernel "${ver}" \
-		"${EROOT}/usr/src/linux-${ver}/${image_path}" \
-		"${EROOT}/usr/src/linux-${ver}/System.map"
+		nonfatal dist-kernel_install_kernel "${ver}" \
+			"${EROOT}/usr/src/linux-${ver}/${image_path}" \
+			"${EROOT}/usr/src/linux-${ver}/System.map" || break
+
+		success=1
+		break
+	done
+
+	if [[ ! ${success} ]]; then
+		eerror
+		eerror "The kernel files were copied to disk successfully but the kernel"
+		eerror "was not deployed successfully.  Once you resolve the problems,"
+		eerror "please run the equivalent of the following command to try again:"
+		eerror
+		eerror "    emerge --config ${CATEGORY}/${PN}:${SLOT}"
+		die "Kernel install failed, please fix the problems and run emerge --config ${CATEGORY}/${PN}:${SLOT}"
+	fi
 }
 
 # @FUNCTION: kernel-install_pkg_postinst
-- 
cgit v1.2.3-65-gdbad