From eaafeaaa0904c5f688825486727218fe804468ed Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Thu, 20 Jan 2005 22:16:55 +0000
Subject: [PATCH] Update clvmd_init_rhel4: use lvm.static and don't load dlm.

---
 WHATS_NEW                |  1 +
 scripts/clvmd_init_rhel4 | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 3483f2932..88f5019e4 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.01.02 - 
 ===================================
+  Update clvmd_init_rhel4: use lvm.static and don't load dlm.
   Fix some size_t printing.
   Fix 64 bit xlate consts.
   Split out pool sptype_names to avoid unused const.
diff --git a/scripts/clvmd_init_rhel4 b/scripts/clvmd_init_rhel4
index b1c2a8610..9b6ddfb00 100644
--- a/scripts/clvmd_init_rhel4
+++ b/scripts/clvmd_init_rhel4
@@ -13,15 +13,12 @@
 
 LOCK_FILE="/var/lock/subsys/clvmd"
 
-#
-# FIXME -- the lvm2-cluster rpms put the lvm tools in a different location
-#
-lvdisplay=/usr/sbin/cluster/lvdisplay
-vgchange=/usr/sbin/cluster/vgchange
+lvdisplay="/sbin/lvm.static lvdisplay"
+vgchange="/sbin/lvm.static vgchange"
+vgscan="/sbin/lvm.static vgscan"
 
 start()
 {
-	modprobe dlm
 	for rtrn in 0
 	do
 		if ! pidof clvmd > /dev/null 
@@ -40,6 +37,9 @@ start()
 			fi
 		fi	
 		
+		# refresh cache
+		$vgscan  > /dev/null 2>&1
+		
 		if [ -n "$LVM_VGS" ]
 		then
 			for vg in $LVM_VGS
@@ -124,7 +124,6 @@ stop()
 			echo
 		fi
 	done
-	modprobe -r dlm > /dev/null 2>&1 
 	
 	return $rtrn
 }