From e4df61777708f7a9a136d667014e2f2bebbd41f3 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 6 Jun 2020 15:12:42 +0100
Subject: [PATCH] Revert "Use udev rules to create dmraid /dev/mapper/ devices"

This reverts commit 9d651355a1c03cb5e17b0cd174f0347c8de5f68e.

This commit stopped dracut from calling kpartx to add the dmraid partitions
under /dev/mapper. The Mageia udev rules don't appear to provide the same
functionality. As a result, a Mageia system installed on a dmraid partition
fails to boot because the root device never appears (mga#26726).

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index edae9784..e7a09b07 100755
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -33,6 +33,8 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd.auto; then
                 if [ "${s##$r}" != "$s" ]; then
                     info "Activating $s"
                     dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
+                    [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo
+                    udevsettle
                 fi
             done
         done
diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
index 8038899a..4316295f 100755
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -75,8 +75,6 @@ install() {
 
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
-    inst_rules 66-kpartx.rules 67-kpartx-compat.rules
-
     inst_libdir_file "libdmraid-events*.so*"
 
     inst_rules "$moddir/61-dmraid-imsm.rules"
-- 
2.21.3