--- /lib/rcscripts/addons/raid-start.sh	2006-10-04 13:33:38.000000000 +0200
+++ /tmp/raid-start.sh	2006-10-04 13:32:46.000000000 +0200
@@ -38,8 +38,15 @@
 fi
 
 # Start software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
-	devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' /etc/mdadm.conf)
+if [[ -x /sbin/mdadm && ( -f /etc/mdadm.conf || -f /etc/mdadm/mdadm.conf ) ]] ; then
+	mdadmconf="/etc/mdadm.conf"
+	if [[ -f /etc/mdadm.conf && -f /etc/mdadm/mdadm.conf ]] ; then
+		diff /etc/mdadm.conf /etc/mdadm/mdadm.conf >/dev/null || ewarn "/etc/mdadm.conf differs from /etc/mdadm/mdadm.conf, going to use /etc/mdadm.conf"
+	fi
+	if [[ ! ( -f /etc/mdadm.conf ) ]] ; then
+		mdadmconf="/etc/mdadm/mdadm.conf"
+	fi
+	devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' $mdadmconf)
 	if [[ -n ${devs} ]] ; then
 		create_devs ${devs}
 		ebegin "Starting up RAID devices (mdadm)"
--- /lib/rcscripts/addons/raid-stop.sh	2006-10-04 13:33:38.000000000 +0200
+++ /tmp/raid-stop.sh	2006-10-04 13:32:50.000000000 +0200
@@ -15,7 +15,7 @@
 fi
 
 # Stop software raid with mdadm (new school)
-if [[ -x /sbin/mdadm && -f /etc/mdadm.conf ]] ; then
+if [[ -x /sbin/mdadm && ( -f /etc/mdadm.conf || -f /etc/mdadm/mdadm.conf ) ]] ; then
 	ebegin "Shutting down RAID devices (mdadm)"
 	output=$(mdadm -Ss 2>&1)
 	ret=$?