From 2d475f8a7b560fe09d760d56ce9787688d848390 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Sat, 3 Dec 2022 13:55:42 -0800 Subject: [PATCH] sys-fs/zfs-kmod: improve new module check in live ebuild Closes: https://github.com/gentoo/gentoo/pull/28498 Signed-off-by: Georgy Yakovlev --- sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 3e4508af22fc9..b31dd845873cd 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -210,8 +210,10 @@ _old_layout_cleanup() { pkg_postinst() { # check for old module layout before doing anything else. # only attempt layout cleanup if new .ko location is used. - [[ -f "${EROOT}/lib/modules/${KV_FULL}/extra/zfs.ko" ]] && _old_layout_cleanup - + local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* ) + # we check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false. + # if glob expanded -f will do correct file precense check. + [[ -f ${newko[0]} ]] && _old_layout_cleanup linux-mod_pkg_postinst if [[ -z ${ROOT} ]] && use dist-kernel; then