From 736751930fe0b2600f9cebf2d58efab0ac0b1c22 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Thu, 30 Nov 2006 10:16:48 +0000
Subject: [PATCH] Add timeout to RHEL4 clvmd init script. With the previous
 clvmd checkin this should address bz#187812

---
 WHATS_NEW                | 1 +
 scripts/clvmd_init_rhel4 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 8a050e4c8..887636e06 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.16 -
 ====================================
+  Add startup timeout to RHEL4 clvmd startup script
   Add -T (startup timeout) switch to clvmd.
   Improve lvm_dump.sh robustness.
   Update lvm2create_initrd to support gentoo.
diff --git a/scripts/clvmd_init_rhel4 b/scripts/clvmd_init_rhel4
index 0debc19ec..51730c22f 100644
--- a/scripts/clvmd_init_rhel4
+++ b/scripts/clvmd_init_rhel4
@@ -15,6 +15,7 @@ VGCHANGE="/usr/sbin/vgchange"
 VGSCAN="/usr/sbin/vgscan"
 VGDISPLAY="/usr/sbin/vgdisplay"
 VGS="/usr/sbin/vgs"
+CLVMDOPTS="-T20"
 
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
 
@@ -27,7 +28,7 @@ start()
 		if ! pidof clvmd > /dev/null 
 		then 
 			echo -n "Starting clvmd: "
-			daemon clvmd
+			daemon clvmd $CLVMDOPTS
 			rtrn=$?
 			echo
 			if [ $rtrn -ne 0 ]