From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Mon, 3 May 2021 10:16:17 +0000 (+0000)
Subject: fix(mdraid): remove dependency statements
X-Git-Tag: 054~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b756346a6b7c5cb5f6fda4d12e2a58b6144e40;p=thirdparty%2Fdracut.git

fix(mdraid): remove dependency statements

mdadm 4.1 was released 2 years ago so it's safe to assume
that everyone are on 4.1.X branch now...
---

diff --git a/modules.d/90mdraid/md-noddf.sh b/modules.d/90mdraid/md-noddf.sh
deleted file mode 100755
index 6bdaa5b27..000000000
--- a/modules.d/90mdraid/md-noddf.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-info "rd.md.ddf=0: no MD RAID for SNIA ddf raids"
-udevproperty rd_NO_MDDDF=1
diff --git a/modules.d/90mdraid/md-noimsm.sh b/modules.d/90mdraid/md-noimsm.sh
deleted file mode 100755
index 392e156a6..000000000
--- a/modules.d/90mdraid/md-noimsm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-info "rd.md.imsm=0: no MD RAID for imsm/isw raids"
-udevproperty rd_NO_MDIMSM=1
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 30a7c01b5..c07802096 100755
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -98,14 +98,6 @@ install() {
     inst_rules "$moddir/59-persistent-storage-md.rules"
     prepare_udev_rules 59-persistent-storage-md.rules
 
-    # guard against pre-3.0 mdadm versions, that can't handle containers
-    if ! mdadm -Q -e imsm /dev/null > /dev/null 2>&1; then
-        inst_hook pre-trigger 30 "$moddir/md-noimsm.sh"
-    fi
-    if ! mdadm -Q -e ddf /dev/null > /dev/null 2>&1; then
-        inst_hook pre-trigger 30 "$moddir/md-noddf.sh"
-    fi
-
     if [[ $hostonly ]] || [[ $mdadmconf == "yes" ]]; then
         if [[ -f $dracutsysrootdir/etc/mdadm.conf ]]; then
             inst -H /etc/mdadm.conf