From 09e562fcdce7c9040a934f44554fe917895e805c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 1 Feb 2008 21:45:55 +0000
Subject: Use udev to intialize configured RAID arrays; conflict with prior
 mdadm versions to ensure the correct version with the rules gets pulled in

---
 initscripts.spec | 2 +-
 rc.d/rc.sysinit  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 9a84e41b..6829bb83 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -19,7 +19,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser
 Requires: udev >= 115-1
 Requires: popt >= 1.12-2
 Requires: cpio, findutils
-Conflicts: mkinitrd < 4.0, kernel < 2.6.12
+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 28972ce5..a1dab044 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -391,12 +391,6 @@ fi
 update_boot_stage RChostname
 action $"Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
 
-# RAID setup
-update_boot_stage RCraid
-if [ -f /etc/mdadm.conf ]; then
-    /sbin/mdadm -A -s --auto=yes
-fi
-
 # Device mapper & related initialization
 if ! __fgrep "device-mapper" /proc/devices >/dev/null 2>&1 ; then
 	modprobe dm-mod >/dev/null 2>&1
-- 
cgit v1.2.1