[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/

[Mike Gilbert]

commit:     3fb0a933f22f3acd65df9a61c51495373784fdaf
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 16:48:24 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 16:48:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb0a933

sys-kernel/dracut: fix up conflicting directories/symlinks in 9999

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 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 8bbef8760f9d..ac29cf44513b 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]" \