From 5021802e2511b2321aa57c4f3195b09cd2aa8918 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 11 Oct 2006 20:30:35 +0000
Subject: - Handle "nodmraid" and "nompath" command line options (#209377)

---
 rc.d/rc.sysinit | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d9d84047..028e4d31 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -424,7 +424,8 @@ if [ -f /etc/crypttab ]; then
 fi
 
 if [ -c /dev/mapper/control ]; then
-        if [ -f /etc/multipath.conf -a -x /sbin/multipath.static ] ; then
+        if ! strstr "$cmdline" nompath && [ -f /etc/multipath.conf -a \
+			-x /sbin/multipath.static ]; then
 		modprobe dm-multipath > /dev/null 2>&1
 		/sbin/multipath.static -v 0
 		if [ -x /sbin/kpartx ]; then
@@ -432,7 +433,7 @@ if [ -c /dev/mapper/control ]; then
 		fi
 	fi
 	
-	if [ -x /sbin/dmraid ]; then
+	if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
 		modprobe dm-mirror >/dev/null 2>&1
 		for x in $(/sbin/dmraid -ay -i -p -t 2>/dev/null | \
 				egrep -iv "^no " | \
-- 
cgit v1.2.1