dracut: Enable mdadm module

diff --git a/config/rootfiles/common/armv5tel/dracut b/config/rootfiles/common/armv5tel/dracut
index 9c41aba9a6480896071e3ff109e3ee94ead46bd0..ecf4325a04aced8edc42a4212a8a1f68bf459828 100644 (file)
--- a/config/rootfiles/common/armv5tel/dracut
+++ b/config/rootfiles/common/armv5tel/dracut
@@ -22,6 +22,19 @@ usr/share/dracut/modules.d/90kernel-modules
 usr/share/dracut/modules.d/90kernel-modules/install
 usr/share/dracut/modules.d/90kernel-modules/installkernel
 usr/share/dracut/modules.d/90kernel-modules/parse-kernel.sh
+usr/share/dracut/modules.d/90mdraid
+usr/share/dracut/modules.d/90mdraid/65-md-incremental-imsm.rules
+usr/share/dracut/modules.d/90mdraid/check
+usr/share/dracut/modules.d/90mdraid/install
+usr/share/dracut/modules.d/90mdraid/installkernel
+usr/share/dracut/modules.d/90mdraid/md-noimsm.sh
+usr/share/dracut/modules.d/90mdraid/md_finished.sh
+usr/share/dracut/modules.d/90mdraid/mdadm_auto.sh
+usr/share/dracut/modules.d/90mdraid/mdcontainer_start.sh
+usr/share/dracut/modules.d/90mdraid/mdmon-pre-udev.sh
+usr/share/dracut/modules.d/90mdraid/mdraid-cleanup.sh
+usr/share/dracut/modules.d/90mdraid/mdraid_start.sh
+usr/share/dracut/modules.d/90mdraid/parse-md.sh
 usr/share/dracut/modules.d/95debug
 usr/share/dracut/modules.d/95debug/check
 usr/share/dracut/modules.d/95debug/install

diff --git a/config/rootfiles/common/i586/dracut b/config/rootfiles/common/i586/dracut
index 27d824372342511ef7fdf133343629cad5b61885..24516f090c9838629f2217b23e435c8c6f00f36f 100644 (file)
--- a/config/rootfiles/common/i586/dracut
+++ b/config/rootfiles/common/i586/dracut
@@ -19,6 +19,19 @@ usr/share/dracut/modules.d/90kernel-modules
 usr/share/dracut/modules.d/90kernel-modules/install
 usr/share/dracut/modules.d/90kernel-modules/installkernel
 usr/share/dracut/modules.d/90kernel-modules/parse-kernel.sh
+usr/share/dracut/modules.d/90mdraid
+usr/share/dracut/modules.d/90mdraid/65-md-incremental-imsm.rules
+usr/share/dracut/modules.d/90mdraid/check
+usr/share/dracut/modules.d/90mdraid/install
+usr/share/dracut/modules.d/90mdraid/installkernel
+usr/share/dracut/modules.d/90mdraid/md-noimsm.sh
+usr/share/dracut/modules.d/90mdraid/md_finished.sh
+usr/share/dracut/modules.d/90mdraid/mdadm_auto.sh
+usr/share/dracut/modules.d/90mdraid/mdcontainer_start.sh
+usr/share/dracut/modules.d/90mdraid/mdmon-pre-udev.sh
+usr/share/dracut/modules.d/90mdraid/mdraid-cleanup.sh
+usr/share/dracut/modules.d/90mdraid/mdraid_start.sh
+usr/share/dracut/modules.d/90mdraid/parse-md.sh
 usr/share/dracut/modules.d/95debug
 usr/share/dracut/modules.d/95debug/check
 usr/share/dracut/modules.d/95debug/install

diff --git a/config/rootfiles/installer/mdadm b/config/rootfiles/installer/mdadm
deleted file mode 100644 (file)
index bd68e78..0000000
--- a/config/rootfiles/installer/mdadm
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/udev/rules.d/64-md-raid.rules
-sbin/mdadm
-sbin/mdmon

diff --git a/lfs/dracut b/lfs/dracut
index aacf7474f69da3408d0a334c99a245d0615bd3ee..22da76dbc630b2460f1991e847753b170209abdb 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cp -vf $(DIR_SRC)/src/dracut/dracut.conf /etc/dracut.conf.d/
 
-       rm -rf /usr/share/dracut/modules.d/*{dash,fips,redhat-i18n,rpmversion,network,ifcfg,plymouth,btrfs,crypt,dm,dmraid,dmsquash-live,lvm,mdraid,multipath,dasd,dasd_mod,fcoe,iscsi,nbd,nfs,resume,uswsusp,zfcp,znet,selinux}
+       rm -rf /usr/share/dracut/modules.d/*{dash,fips,redhat-i18n,rpmversion,network,ifcfg,plymouth,btrfs,crypt,dm,dmraid,dmsquash-live,lvm,multipath,dasd,dasd_mod,fcoe,iscsi,nbd,nfs,resume,uswsusp,zfcp,znet,selinux}
 
        sed -e "s/--resolve-names=never//g" -i \
                /usr/share/dracut/modules.d/99base/init