aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit2
2 files changed, 2 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index cce1be7a..ff19192b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -28,7 +28,7 @@ Requires: /etc/redhat-release
Requires: /sbin/runuser
Requires: udev >= 125-1
Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3
+Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: dhclient < 12:4.1.0-6
Conflicts: tcsh < 6.13-5
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 803df568..aa056d9b 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -373,7 +373,7 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
fi
# Start any MD RAID arrays that haven't been started yet
-[ -f /etc/mdadm.conf ] && [ -x /sbin/mdadm ] && /sbin/mdadm -As --auto=yes --run
+[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs
if [ -x /sbin/lvm ]; then
export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1