commit: ba2f5edc7666b74128c74ae077cf062d1b120d47 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 8 01:07:42 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 8 01:12:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2f5edc
sys-kernel/dracut: fix up conflicting directories/symlinks Closes: https://bugs.gentoo.org/943007 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../dracut/{dracut-105.ebuild => dracut-105-r1.ebuild} | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys-kernel/dracut/dracut-105.ebuild b/sys-kernel/dracut/dracut-105-r1.ebuild similarity index 93% rename from sys-kernel/dracut/dracut-105.ebuild rename to sys-kernel/dracut/dracut-105-r1.ebuild index b6668b2572f4..19082b840ad0 100644 --- a/sys-kernel/dracut/dracut-105.ebuild +++ b/sys-kernel/dracut/dracut-105-r1.ebuild @@ -155,6 +155,22 @@ src_install() { dodoc dracut.html } +pkg_preinst() { + # Remove directory/symlink conflicts + # https://bugs.gentoo.org/943007 + local module backup + 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 + for backup in "${module}".backup.*; do + if [[ -L ${backup} ]]; then + rm -v "${backup}" || die + fi + done + done +} + pkg_postinst() { optfeature "Networking support" net-misc/networkmanager optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
