aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit4
2 files changed, 3 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 3afa3841..34a4c6ec 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser
Requires: udev >= 125-1
Requires: popt >= 1.12-2
Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 3.0-0.devel3.1
+Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: dhclient < 3.0.3-7
Conflicts: tcsh < 6.13-5
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 5e5698fe..9598a28d 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -337,8 +337,8 @@ sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
update_boot_stage RChostname
action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
-# Wait for incremental assembly of RAID to finish
-udevadm settle --timeout=5
+# Start any MD RAID arrays that haven't been started yet
+[ -f /etc/mdadm.conf -a -x /sbin/mdadm ] && /sbin/mdadm -As --auto=yes --run
# Device mapper & related initialization
if ! __fgrep "device-mapper" /proc/devices >/dev/null 2>&1 ; then