From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 08 Dec 2008 14:02:48 +0000
Subject: [Cluster-devel] cman: loading lock_dlm module should be optional in
	initscript
Message-ID: <1228744968.9571.331.camel@quoit>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit


Loading the lock_dlm module should be optional since it is optional
in the kernel configuration, and in the future we intend to merge
it into gfs2 itself.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 1012681..7d71e1b 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -148,7 +148,7 @@ load_modules()
 {
     errmsg=$( /sbin/modprobe configfs 2>&1 ) || return 1
     errmsg=$( /sbin/modprobe dlm 2>&1 ) || return 1
-    errmsg=$( /sbin/modprobe lock_dlm 2>&1 ) || return 1
+    errmsg=$( /sbin/modprobe lock_dlm 2>&1 ) || true
     return 0
 }