[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.00-45-g446f789

[fabbione@sourceware.org <fabbione@sourceware.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=446f78915e0d8f1964cb2cfccbced47768d215b9

The branch, master has been updated
       via  446f78915e0d8f1964cb2cfccbced47768d215b9 (commit)
      from  35e9ac574a7501d3ed3fb02da36d230611aa5284 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 446f78915e0d8f1964cb2cfccbced47768d215b9
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue May 13 23:44:07 2008 +0200

    [MISC] Cast some love to init scripts
    
    - Fix LSB headers
    - Use standard templates
    - Align runlevels
    - Add service dependencies
    - Fix subsystem usage
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/init.d/cman.in            |   15 ++++++++++++---
 cman/init.d/qdiskd             |   19 +++++++++++++------
 fence/agents/scsi/scsi_reserve |   26 ++++++++++++++++++++++++--
 gfs2/init.d/gfs2               |   13 +++++++++----
 rgmanager/init.d/rgmanager.in  |   15 ++++++++++++---
 5 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index a08d4dd..55358fd 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -1,12 +1,21 @@
 #!/bin/bash
 #
+# cman - Cluster Manager init script
+#
 # chkconfig: 345 21 79
 # description: Starts and stops cman
 #
 #
 ### BEGIN INIT INFO
-# Provides:
+# Provides:		cman
+# Required-Start:	$network
+# Required-Stop:	$network
+# Default-Start:	3 4 5
+# Default-Stop:		0 1 2 6
+# Short-Description:	Starts and stops cman
+# Description:		Starts and stops the Cluster Manager set of daemons
 ### END INIT INFO
+
 . /etc/init.d/functions
 
 [ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman
@@ -559,7 +568,7 @@ case "$1" in
 	fi
 	;;
 
-    restart)
+    restart|reload)
 	$0 stop restart
 	$0 start
 	rtrn=$?
@@ -576,7 +585,7 @@ case "$1" in
 	;;
 
     *)
-	    echo $"Usage: $0 {start|stop|restart|status}"
+	    echo $"Usage: $0 {start|stop|reload|restart|status}"
 	    ;;
 esac
 
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
index 0a2c97a..c4aa4a9 100755
--- a/cman/init.d/qdiskd
+++ b/cman/init.d/qdiskd
@@ -1,11 +1,18 @@
 #!/bin/bash
 #
-# chkconfig: 345 22 78
-# description: Starts and stops the quroum disk daemon
+# qdiskd quorum disk daemon
 #
-#	       
+# chkconfig: 345 22 78
+# description: Starts and stops the quorum disk daemon
+
 ### BEGIN INIT INFO
-# Provides: 
+# Provides: 		qdiskd
+# Required-Start:	cman
+# Required-Stop:	cman
+# Default-Start:	3 4 5
+# Default-Stop:		0 1 2 6
+# Short-Description:	start/stop quorum disk daemon
+# Description:		start/stop quorum disk daemon
 ### END INIT INFO
 
 . /etc/init.d/functions
@@ -61,7 +68,7 @@ case "$1" in
 	fi
 	;;
 
-  restart)
+  restart|reload)
 	$0 stop || exit $?
 	$0 start 
 	rtrn=$?
@@ -73,7 +80,7 @@ case "$1" in
 	;;
 
   *)
-	echo $"Usage: $0 {start|stop|restart|status}"
+	echo $"Usage: $0 {start|stop|reload|restart|status}"
 	;;
 esac
 
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
index 67c0d2d..8b85aa9 100755
--- a/fence/agents/scsi/scsi_reserve
+++ b/fence/agents/scsi/scsi_reserve
@@ -1,10 +1,19 @@
 #!/bin/bash
 #
-# scsi_reserve:
+# scsi_reserve persistent reservation service for lvm
 #
 # chkconfig: 345 25 75
 # description: start/stop persistent reservation service for lvm
-# config: /etc/sysconfig/scsi_reserve
+
+### BEGIN INIT INFO
+# Provides:		scsi_reserve
+# Required-Start:	cman
+# Required-Stop:	cman
+# Default-Start:	3 4 5
+# Default-Stop:		0 1 2 6
+# Short-Description:	start/stop persistent reservation service for lvm
+# Description:		start/stop persistent reservation service for lvm
+### END INIT INFO
 
 . /etc/init.d/functions
 
@@ -154,6 +163,8 @@ case $1 in
 	    failure
 	fi
 
+	touch /var/lock/subsys/scsi_reserve
+
 	echo
 
 	;; # end of start
@@ -215,6 +226,8 @@ case $1 in
 	    failure
 	fi
 
+	rm -f /var/lock/subsys/scsi_reserve
+
 	echo
 
 	;; # end of stop
@@ -243,6 +256,15 @@ case $1 in
 
 	;; # end of status
 
+    restart|reload)
+	$0 stop
+	$0 start
+	;;
+
+    *)
+	echo $"Usage: $0 {start|stop|restart|reload|status}"
+	exit 1
+
 esac
 
 exit $error
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
index cafe341..26c99d5 100755
--- a/gfs2/init.d/gfs2
+++ b/gfs2/init.d/gfs2
@@ -1,13 +1,18 @@
 #!/bin/bash
 #
-# 
+# gfs2 mount/unmount helper
 #
 # chkconfig: 345 26 74
 # description: mount/unmount gfs2 filesystems configured in /etc/fstab
-#
-#	       
+
 ### BEGIN INIT INFO
-# Provides: 
+# Provides:		gfs2
+# Required-Start:	$network cman
+# Required-Stop:	$network cman
+# Default-Start:	3 4 5
+# Default-Stop:		0 1 2 6
+# Short-Description:	mount/unmount gfs2 filesystems configured in /etc/fstab
+# Description:		mount/unmount gfs2 filesystems configured in /etc/fstab
 ### END INIT INFO
 
 . /etc/init.d/functions
diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
index 7355d86..eb2c065 100644
--- a/rgmanager/init.d/rgmanager.in
+++ b/rgmanager/init.d/rgmanager.in
@@ -6,9 +6,18 @@
 # the terms of the GNU General Public License version 2, or (at your option)
 # any later version.
 #
-# description:  Starts and stops Red Hat Service (resource group) Manager
-# chkconfig: 2345 99 01
-#
+# chkconfig: 345 99 01
+# description: Starts and stops Red Hat Service (resource group) Manager
+
+### BEGIN INIT INFO
+# Provides:		rgmanager
+# Required-Start:	cman
+# Required-Stop:	cman
+# Default-Start:	3 4 5
+# Default-Stop:		0 1 2 6
+# Short-Description:	Starts and stops Red Hat Service (resource group) Manager
+# Description:		Starts and stops Red Hat Service (resource group) Manager
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions


hooks/post-receive
--
Cluster Project