From 3fb0a933f22f3acd65df9a61c51495373784fdaf Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 11 Nov 2024 11:48:24 -0500 Subject: [PATCH] sys-kernel/dracut: fix up conflicting directories/symlinks in 9999 Signed-off-by: Mike Gilbert --- sys-kernel/dracut/dracut-9999.ebuild | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 8bbef8760f9df..ac29cf44513bd 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -153,6 +153,24 @@ src_install() { dodoc dracut.html } +pkg_preinst() { + # Remove directory/symlink conflicts + # https://bugs.gentoo.org/943007 + local save_nullglob=$(shopt -p nullglob) + shopt -s nullglob + local module + for module in "${EROOT}"/usr/lib/dracut/modules.d/{80test,80test-makeroot,80test-root}; do + if [[ ! -L ${module} && -d ${module} ]]; then + rm -rv "${module}" || die + fi + local backups=( "${module}".backup.* ) + if [[ ${#backups[@]} -gt 0 ]]; then + rm -v "${backups[@]}" || die + fi + done + eval "${save_nullglob}" +} + pkg_postinst() { optfeature "Networking support" net-misc/networkmanager optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \