diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-01-09 22:01:22 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-01-09 22:36:35 +0100 |
commit | 171c2f780c47ed4096572795f1d91fd7d8ab140f (patch) | |
tree | ca111534a063f798f69db2598ab8874972d9fe4e /eclass/kernel-install.eclass | |
parent | net-misc/remmina: bump to 1.3.10 (diff) | |
download | gentoo-171c2f780c47ed4096572795f1d91fd7d8ab140f.tar.gz gentoo-171c2f780c47ed4096572795f1d91fd7d8ab140f.tar.bz2 gentoo-171c2f780c47ed4096572795f1d91fd7d8ab140f.zip |
kernel-install.eclass: Fix initrd location
Closes: https://bugs.gentoo.org/705058
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/kernel-install.eclass')
-rw-r--r-- | eclass/kernel-install.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index f44fc3ebfa9b..7e64f44c8c33 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -269,15 +269,17 @@ kernel-install_pkg_postinst() { if [[ -z ${ROOT} ]]; then mount-boot_pkg_preinst + local image_path=$(kernel-install_get_image_path) if use initramfs; then # putting it alongside kernel image as 'initrd' makes # kernel-install happier kernel-install_build_initramfs \ - "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}" + "${EROOT}/usr/src/linux-${PV}/${image_path%/*}/initrd" \ + "${PV}" fi kernel-install_install_kernel "${PV}" \ - "${EROOT}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \ + "${EROOT}/usr/src/linux-${PV}/${image_path}" \ "${EROOT}/usr/src/linux-${PV}/System.map" fi |