Cluster Project branch, STABLE2, updated. cluster-2.03.02-22-gdc6c5bc
fabbione@sourceware.org
fabbione@sourceware.org
Mon May 19 04:39:00 GMT 2008
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=dc6c5bc67acb54b8db4826df04678b0359b02dc1
The branch, STABLE2 has been updated
via dc6c5bc67acb54b8db4826df04678b0359b02dc1 (commit)
via eca8f595e7836a0b0ce019d299dd7f9523f0bcbd (commit)
via 239008da8d61f99231df7107976b78d8bcd36263 (commit)
via f0235f3cdd72413f1dd40217af06be919f710744 (commit)
from 0c7bd530bb56848a8818f9b6389bd7fed67b1d73 (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 dc6c5bc67acb54b8db4826df04678b0359b02dc1
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Mon May 19 06:30:48 2008 +0200
[INIT] Do not start services automatically
Apply Fedora policy to not start services automatically
to our init scripts.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit eca8f595e7836a0b0ce019d299dd7f9523f0bcbd
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Wed May 14 00:31:48 2008 +0200
[CMAN] Fix path to cman_tool
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit 239008da8d61f99231df7107976b78d8bcd36263
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>
commit f0235f3cdd72413f1dd40217af06be919f710744
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Mon May 19 06:34:04 2008 +0200
[GFS] Sync with gfs2 init script
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
cman/init.d/cman.in | 27 ++++++++++++++++++---------
cman/init.d/qdiskd | 19 +++++++++++++------
fence/agents/scsi/scsi_reserve | 28 +++++++++++++++++++++++++---
gfs/init.d/gfs | 15 ++++++++++-----
gfs2/init.d/gfs2 | 15 ++++++++++-----
rgmanager/init.d/rgmanager.in | 15 ++++++++++++---
6 files changed, 88 insertions(+), 31 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index a08d4dd..1134e80 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -1,12 +1,21 @@
#!/bin/bash
#
-# chkconfig: 345 21 79
+# cman - Cluster Manager init script
+#
+# chkconfig: - 21 79
# description: Starts and stops cman
#
#
### BEGIN INIT INFO
-# Provides:
+# Provides: cman
+# Required-Start: $network
+# Required-Stop: $network
+# Default-Start:
+# Default-Stop:
+# 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
@@ -92,15 +101,15 @@ start_ccsd()
start_cman()
{
# cman
- /usr/sbin/cman_tool status &> /dev/null
+ /sbin/cman_tool status &> /dev/null
if [ $? -ne 0 ]
then
- errmsg=$( /usr/sbin/cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \
+ errmsg=$( /sbin/cman_tool -t $CMAN_CLUSTER_TIMEOUT -w join \
$cman_join_opts 2>&1 ) || return 1
if [ $CMAN_QUORUM_TIMEOUT -gt 0 ]
then
- errmsg=$( /usr/sbin/cman_tool -t $CMAN_QUORUM_TIMEOUT \
+ errmsg=$( /sbin/cman_tool -t $CMAN_QUORUM_TIMEOUT \
-q wait 2>&1 ) || return 1
fi
fi
@@ -398,10 +407,10 @@ stop_ccsd()
stop_cman()
{
- /usr/sbin/cman_tool status &> /dev/null
+ /sbin/cman_tool status &> /dev/null
if [ $? -eq 0 ]
then
- errmsg=$( /usr/sbin/cman_tool -t $CMAN_SHUTDOWN_TIMEOUT \
+ errmsg=$( /sbin/cman_tool -t $CMAN_SHUTDOWN_TIMEOUT \
-w leave $1 2>&1 ) || return 1
fi
return 0 # all ok
@@ -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..62bd33f 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: - 22 78
+# description: Starts and stops the quorum disk daemon
+
### BEGIN INIT INFO
-# Provides:
+# Provides: qdiskd
+# Required-Start: cman
+# Required-Stop: cman
+# Default-Start:
+# Default-Stop:
+# 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..00fc650 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
+# chkconfig: - 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:
+# Default-Stop:
+# 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/gfs/init.d/gfs b/gfs/init.d/gfs
index c4ee890..8116db1 100755
--- a/gfs/init.d/gfs
+++ b/gfs/init.d/gfs
@@ -1,13 +1,18 @@
#!/bin/bash
#
-#
+# gfs mount/unmount helper
#
-# chkconfig: 345 26 74
+# chkconfig: - 26 74
# description: mount/unmount gfs filesystems configured in /etc/fstab
-#
-#
+
### BEGIN INIT INFO
-# Provides:
+# Provides: gfs
+# Required-Start: $network cman
+# Required-Stop: $network cman
+# Default-Start:
+# Default-Stop:
+# Short-Description: mount/unmount gfs filesystems configured in /etc/fstab
+# Description: mount/unmount gfs filesystems configured in /etc/fstab
### END INIT INFO
. /etc/init.d/functions
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
index cafe341..146d789 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
+# chkconfig: - 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:
+# Default-Stop:
+# 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..a5e6c4a 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: - 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:
+# Default-Stop:
+# 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
More information about the Cluster-cvs
mailing list