Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 01 Mar 2021 09:41:21
Message-Id: 1614591649.f44731832a54b0eb0c179297446a971183470ae5.mgorny@gentoo
1 commit: f44731832a54b0eb0c179297446a971183470ae5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 1 09:19:06 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 1 09:40:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4473183
7
8 kernel-install.eclass: Fix initrd cleanup for uefi=yes
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/kernel-install.eclass | 5 ++---
13 1 file changed, 2 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
16 index 56d40760557..231dce2de6a 100644
17 --- a/eclass/kernel-install.eclass
18 +++ b/eclass/kernel-install.eclass
19 @@ -414,8 +414,7 @@ kernel-install_pkg_prerm() {
20
21 # @FUNCTION: kernel-install_pkg_postrm
22 # @DESCRIPTION:
23 -# No-op at the moment. Will be used to remove obsolete kernels
24 -# in the future.
25 +# Clean up the generated initramfs from the removed kernel directory.
26 kernel-install_pkg_postrm() {
27 debug-print-function ${FUNCNAME} "${@}"
28
29 @@ -423,7 +422,7 @@ kernel-install_pkg_postrm() {
30 local ver="${PV}${KV_LOCALVERSION}"
31 local image_path=$(dist-kernel_get_image_path)
32 ebegin "Removing initramfs"
33 - rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" &&
34 + rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}"/initrd{,.uefi} &&
35 find "${EROOT}/usr/src/linux-${ver}" -depth -type d -empty -delete
36 eend ${?}
37 fi