[kernel] r9984 - dists/trunk/redhat-cluster/redhat-cluster/debian

Wed Dec 19 17:28:50 UTC 2007

Author: fs
Date: Wed Dec 19 17:28:50 2007
New Revision: 9984

Log:
Add LSB sections to the init scripts


Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================

--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	Wed Dec 19 17:28:50 2007
@@ -25,6 +25,5 @@
     Closes: #401073, #426769
   * Mention gfs and gnbd kernel modules in the redhat-cluster-modules source
     and binary package descriptions. Closes: #380002
-  * 
 
  -- Frederik Schüler <fs at debian.org>  Wed, 19 Dec 2007 14:39:28 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	Wed Dec 19 17:28:50 2007
@@ -1,8 +1,18 @@
-#!/bin/bash
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          cluster manager
+# Required-Start:    $network $time
+# Required-Stop:     $network $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts and stops cman
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=cman
 DESC="cluster manager"
+CONF=/etc/cluster/cluster.conf
 
 test -x /usr/sbin/cman_tool || exit 0
 
@@ -10,15 +20,31 @@
 
 CCSD_OPTS=""
 
-# cman
-
-CMAN_CLUSTER_TIMEOUT=120
-CMAN_QUORUM_TIMEOUT=0
-CMAN_SHUTDOWN_TIMEOUT=60
-
-CONF=/etc/cluster/cluster.conf
-
-set -e
+# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster
+#     before giving up.  If CMAN_CLUSTER_TIMEOUT is positive, then we will
+#     wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when
+#     a cluster is not joined.  If CMAN_CLUSTER_TIMEOUT is zero, then
+#     wait indefinately for a cluster join.  If CMAN_CLUSTER_TIMEOUT is
+#     negative, do not check to see that the cluster has been joined
+[ -z "$CMAN_CLUSTER_TIMEOUT" ] && CMAN_CLUSTER_TIMEOUT=120
+
+# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on 
+#     startup quorum is needed by many other applications, so we may as 
+#     well wait here.  If CMAN_QUORUM_TIMEOUT is less than 1, quorum will 
+#     be ignored.
+[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0
+
+# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a 
+#     cluster member before calling cman_tool leave during shutdown.  
+#     default is 60 seconds
+[ -z "$CMAN_SHUTDOWN_TIMEOUT" ] && CMAN_SHUTDOWN_TIMEOUT=60
+
+# FENCED_START_TIMEOUT -- amount of time to wait for starting fenced
+#     before giving up.  If FENCED_START_TIMEOUT is positive, then we will
+#     wait FENCED_START_TIMEOUT seconds before giving up and failing when
+#     fenced does not start.  If FENCED_START_TIMEOUT is zero, then
+#     wait indefinately for fenced to start.
+[ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300
 
 load_modules() {
 	modprobe configfs 2>&1 || true
@@ -84,7 +110,7 @@
 	start-stop-daemon --start --quiet --pidfile /var/run/gfs_controld.pid --exec /usr/sbin/gfs_controld
 	echo " gfs_controld"
 	echo -n " Joining fence domain:"
-	fence_tool join
+	fence_tool -w -t $FENCED_START_TIMEOUT join
 	echo " done"
 	echo -n " Starting Quorum Disk daemon:"
 	start-stop-daemon --start --quiet --pidfile /var/run/qdiskd.pid --exec /usr/sbin/qdiskd -- -Q

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.init	Wed Dec 19 17:28:50 2007
@@ -1,4 +1,13 @@
-#!/bin/bash
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          global filesystem 
+# Required-Start:    cman
+# Required-Stop:     cman
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: mount and unmount GFS shares
+### END INIT INFO
 
 #
 # This script's behavior is modeled closely after the netfs script.  

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs2-tools.init	Wed Dec 19 17:28:50 2007
@@ -1,4 +1,13 @@
-#!/bin/bash
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          global filesystem version 2
+# Required-Start:    cman
+# Required-Stop:     cman
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: mount and unmount GFS v2 shares
+### END INIT INFO
 
 #
 # This script's behavior is modeled closely after the netfs script.  

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.init	Wed Dec 19 17:28:50 2007
@@ -1,5 +1,14 @@
 #! /bin/sh
 
+### BEGIN INIT INFO
+# Provides:          global network block device client
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start and stop gnbd client
+### END INIT INFO
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/gnbd_import
 NAME=gnbd_import

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.init	Wed Dec 19 17:28:50 2007
@@ -1,5 +1,15 @@
 #! /bin/sh
 
+### BEGIN INIT INFO
+# Provides:          global network block device server
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start and stop the gnbd server
+### END INIT INFO
+
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/gnbd_serv
 NAME=gnbd_serv

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rgmanager.init	Wed Dec 19 17:28:50 2007
@@ -1,5 +1,17 @@
 #!/bin/sh
 
+### BEGIN INIT INFO
+# Provides:          cluster service manager
+# Required-Start:    $network cman 
+# Required-Stop:     $network cman
+# Should-Start:      gfs-tools gfs2-tools
+# Should-Stop:       gfs-tools gfs2-tools
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: start and stop the cluster service manager
+### END INIT INFO
+
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="cluster service manager"
 NAME=clurgmgrd

