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
2010-01-27 15:52:08 +01:00 · 2010-01-27 15:52:08 +01:00 · d8231fa5c2
parent 5db587d7c1
commit d8231fa5c2
1 changed files with 5 additions and 2 deletions
--- 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