diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-04-09 15:44:39 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-04-09 15:44:39 -0400 |
| commit | 861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39 (patch) | |
| tree | f989b4b8c1bc30f2638f5e1bf00c7066d7924096 | |
| parent | e7147f08077a63d2ca4d256f00764c2e5433da06 (diff) | |
| download | initscripts-861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39.tar initscripts-861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39.tar.gz initscripts-861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39.tar.bz2 initscripts-861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39.tar.xz initscripts-861196445a1cf1e86a9ab8d74c5ff4c3d9c75b39.zip | |
Change how we handle RAID arrays. (<dledford@redhat.com>)
Conflict with older mdadm to make sure we're in sync.
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 2 |
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 |