diff options
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index 0b2771d3..db8701f6 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -37,6 +37,7 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.18 Conflicts: plymouth < 0.7.0-0.2009.02.26 Conflicts: s390utils < 2:1.8.2-11 +Conflicts: dmraid < 1.0.0.rc16-7 # http://bugzilla.redhat.com/show_bug.cgi?id=252973 Conflicts: nut < 2.2.0 Obsoletes: hotplug diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index dacf3169..bb7a15cc 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -360,7 +360,7 @@ fi if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then modprobe dm-mirror >/dev/null 2>&1 dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i) - if [ "$?" = "0" -a "$dmraidsets" != "no raid disks" -a "$dmraidsets" != "no block devices found" ]; then + if [ "$?" = "0" ]; then for dmname in $dmraidsets; do if [[ "$dmname" =~ '^isw_.*' ]] && \ ! strstr "$cmdline" noiswmd; then |