diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-03-31 11:20:32 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-03-31 11:22:26 -0400 |
| commit | 301dd44b3fadf1e97644ad462b1ee42043d2f5ef (patch) | |
| tree | 2885f91641d970bf22dc00b994871add7f1e2ddc | |
| parent | 616d9febe54f3f54be2ed8c4bd609d8e8551f347 (diff) | |
| download | initscripts-301dd44b3fadf1e97644ad462b1ee42043d2f5ef.tar initscripts-301dd44b3fadf1e97644ad462b1ee42043d2f5ef.tar.gz initscripts-301dd44b3fadf1e97644ad462b1ee42043d2f5ef.tar.bz2 initscripts-301dd44b3fadf1e97644ad462b1ee42043d2f5ef.tar.xz initscripts-301dd44b3fadf1e97644ad462b1ee42043d2f5ef.zip | |
Revert mdadm changes.F9-branch
This reverts commit 67e59d33e57d4c8feba356320bead2451cbb921b.
This reverts commit fcc54b6f014c63b64e37b0d63d871f344385da84.
| -rw-r--r-- | initscripts.spec | 4 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index b32e3544..a2d2da96 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -27,8 +27,8 @@ Requires: /etc/redhat-release, dev 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, mdadm < 2.6.8 +Requires: cpio +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 bf0820f7..e4faea76 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -320,8 +320,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 |