mdraid: prefer /etc/mdadm.conf over /etc/mdadm/mdadm.conf

see https://bugzilla.redhat.com/show_bug.cgi?id=557339
https://bugzilla.redhat.com/show_bug.cgi?id=559073

diff --git a/modules.d/90mdraid/install b/modules.d/90mdraid/install
index 059edfbd5beae8345b7c3dac9349c5ab383221d6..6045aaf904d605f58bfe66b05b8adeebba2e4cf7 100755 (executable)
--- a/modules.d/90mdraid/install
+++ b/modules.d/90mdraid/install
@@ -22,8 +22,11 @@ if ! mdadm -Q -e imsm /dev/null &> /dev/null; then
 fi
 
 if [[ $hostonly ]] || [[ $mdadmconf = "yes" ]]; then 
-    [ -f /etc/mdadm/mdadm.conf ] && inst /etc/mdadm/mdadm.conf /etc/mdadm.conf
-    [ -f /etc/mdadm.conf ] && inst /etc/mdadm.conf
+    if [ -f /etc/mdadm.conf ]; then
+        inst /etc/mdadm.conf
+    else
+        [ -f /etc/mdadm/mdadm.conf ] && inst /etc/mdadm/mdadm.conf /etc/mdadm.conf
+    fi
 fi
 
 if [ -x  /sbin/mdmon ] ; then