LVM2 ./WHATS_NEW scripts/clvmd_init_rhel4

LVM2 ./WHATS_NEW scripts/clvmd_init_rhel4

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk at sourceware.org	2006-11-01 18:25:26

Modified files:
	.              : WHATS_NEW 
	scripts        : clvmd_init_rhel4 

Log message:
	Fix clustered VG detection and default runlevels in clvmd_init_rhel4.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.487&r2=1.488
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/clvmd_init_rhel4.diff?cvsroot=lvm2&r1=1.8&r2=1.9

--- LVM2/WHATS_NEW	2006/10/30 16:10:55	1.487
+++ LVM2/WHATS_NEW	2006/11/01 18:25:26	1.488
@@ -1,5 +1,6 @@
 Version 2.02.14 - 
 ===================================
+  Fix clustered VG detection and default runlevels in clvmd_init_rhel4.
   Fix high-level free space check for partial allocations.
 
 Version 2.02.13 - 27th October 2006
--- LVM2/scripts/clvmd_init_rhel4	2006/10/04 08:42:14	1.8
+++ LVM2/scripts/clvmd_init_rhel4	2006/11/01 18:25:26	1.9
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 345 24 76
+# chkconfig: - 24 76
 # description: Starts and stops clvmd
 #
 #	       
@@ -73,7 +73,7 @@
 			done
 		else
 			# Hack to only deactivate clustered volumes
-		        clustervgs=`$VGDISPLAY \`$VGS --noheadings -o name\` | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
+			clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'
 			for vg in $clustervgs; do
 				if ! action "Deactivating VG $vg:" $VGCHANGE -anl $vg
 				then

LVM2 ./WHATS_NEW scripts/clvmd_init_rhel4

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk at sourceware.org	2006-11-21 17:44:46

Modified files:
	.              : WHATS_NEW 
	scripts        : clvmd_init_rhel4 

Log message:
	Fix clvmd_init_rhel4 line truncation (2.02.14).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.504&r2=1.505
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/clvmd_init_rhel4.diff?cvsroot=lvm2&r1=1.9&r2=1.10

--- LVM2/WHATS_NEW	2006/11/20 23:30:45	1.504
+++ LVM2/WHATS_NEW	2006/11/21 17:44:45	1.505
@@ -1,8 +1,9 @@
 Version 2.02.16 -
 ====================================
 
-Version 2.02.15 - 20th November 2006
+Version 2.02.15 - 21st November 2006
 ====================================
+  Fix clvmd_init_rhel4 line truncation (2.02.14).
   Install lvmdump by default.
   Fix check for snapshot module when activating snapshot.
   Fix pvremove error path for case when PV is in use.
--- LVM2/scripts/clvmd_init_rhel4	2006/11/01 18:25:26	1.9
+++ LVM2/scripts/clvmd_init_rhel4	2006/11/21 17:44:46	1.10
@@ -73,7 +73,7 @@
 			done
 		else
 			# Hack to only deactivate clustered volumes
-			clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'
+			clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
 			for vg in $clustervgs; do
 				if ! action "Deactivating VG $vg:" $VGCHANGE -anl $vg
 				then

LVM2 ./WHATS_NEW scripts/clvmd_init_rhel4

[pcaulfield]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	pcaulfield at sourceware.org	2006-11-30 10:16:48

Modified files:
	.              : WHATS_NEW 
	scripts        : clvmd_init_rhel4 

Log message:
	Add timeout to RHEL4 clvmd init script.
	With the previous clvmd checkin this should address bz#187812

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.508&r2=1.509
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/clvmd_init_rhel4.diff?cvsroot=lvm2&r1=1.10&r2=1.11

--- LVM2/WHATS_NEW	2006/11/30 09:44:06	1.508
+++ LVM2/WHATS_NEW	2006/11/30 10:16:47	1.509
@@ -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.
--- LVM2/scripts/clvmd_init_rhel4	2006/11/21 17:44:46	1.10
+++ LVM2/scripts/clvmd_init_rhel4	2006/11/30 10:16:48	1.11
@@ -15,6 +15,7 @@
 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 @@
 		if ! pidof clvmd > /dev/null 
 		then 
 			echo -n "Starting clvmd: "
-			daemon clvmd
+			daemon clvmd $CLVMDOPTS
 			rtrn=$?
 			echo
 			if [ $rtrn -ne 0 ]