update to STABLE32 3.1.92

diff --git a/Makefile b/Makefile
index 684cb75cc5091ac09a5464559c6626d98c4aee34..f9382cf0518c4d1c8d1cb253a1e4e1639acd713f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=2.0
 
-RHCVER=3.1.8
-RHCBRANCH=origin/STABLE31
+RHCVER=3.1.92
+RHCBRANCH=origin/STABLE32
 
 RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=3
+PKGREL=1
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \

diff --git a/cluster-3.1.8.tar.gz b/cluster-3.1.8.tar.gz
deleted file mode 100644 (file)
index 2048bb9..0000000
Binary files a/cluster-3.1.8.tar.gz and /dev/null differ

diff --git a/cluster-3.1.92.tar.gz b/cluster-3.1.92.tar.gz
new file mode 100644 (file)
index 0000000..ca61316
Binary files /dev/null and b/cluster-3.1.92.tar.gz differ

diff --git a/debian/changelog b/debian/changelog
index 5c1f5bece0598558d787f8d0d8b026e757d0636b..16ddf1a6d8d14667a9ee311b5e54a0a33ff3bedb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+redhat-cluster-pve (3.1.92-1) unstable; urgency=low
+
+  * update to STABLE32 3.1.92
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 13 Jun 2012 15:48:46 +0200
+
 redhat-cluster-pve (3.1.8-3) unstable; urgency=low
 
   * do not join fence domain by default

diff --git a/debian/patches/fix-cluster-schema.diff b/debian/patches/fix-cluster-schema.diff
index 3ade5808413e8015126833d753299540e57f7276..1fd6340133872cfd9892d33bfb0c8ddfd5b77a60 100644 (file)
--- a/debian/patches/fix-cluster-schema.diff
+++ b/debian/patches/fix-cluster-schema.diff
@@ -1,8 +1,8 @@
 Index: new/config/tools/xml/cluster.rng.in.head
 ===================================================================
---- new.orig/config/tools/xml/cluster.rng.in.head      2011-12-13 12:55:22.000000000 +0100
-+++ new/config/tools/xml/cluster.rng.in.head   2011-12-13 12:56:30.000000000 +0100
-@@ -988,6 +988,9 @@
+--- new.orig/config/tools/xml/cluster.rng.in.head      2012-06-13 15:50:21.000000000 +0200
++++ new/config/tools/xml/cluster.rng.in.head   2012-06-13 15:59:27.000000000 +0200
+@@ -997,6 +997,9 @@
     <zeroOrMore>
      <ref name="VM"/>
     </zeroOrMore>

diff --git a/debian/patches/fix-cman-init.diff b/debian/patches/fix-cman-init.diff
index d2183b63e1e19b48290a5b008bd986b1531a5217..046568967005fb1d899fc5c5143c5b7aa9e83578 100644 (file)
--- a/debian/patches/fix-cman-init.diff
+++ b/debian/patches/fix-cman-init.diff
@@ -3,21 +3,21 @@
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2011-12-22 09:52:56.000000000 +0100
-+++ new/cman/init.d/cman.in    2011-12-22 09:55:29.000000000 +0100
-@@ -19,6 +19,8 @@
- # set secure PATH
- PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+--- new.orig/cman/init.d/cman.in       2012-06-13 15:50:21.000000000 +0200
++++ new/cman/init.d/cman.in    2012-06-13 15:55:37.000000000 +0200
+@@ -22,6 +22,8 @@
+ # save invokation for rollback ops
+ thisinvokation="$0"
  
 +test -x @SBINDIR@/cman_tool || exit 0
 +
  chkconfig2()
  {
        case "$1" in
-@@ -129,7 +131,7 @@
- #     set to "yes", then the script will attempt to join the fence domain.
- #     If FENCE_JOIN is set to any other value, the default behavior is
- #     to join the fence domain (equivalent to "yes").
+@@ -138,7 +140,7 @@
+ #     When setting FENCE_JOIN to "no", it is important to check 
+ #     DLM_CONTROLD_OPTS to reflect expected behavior regarding fencing
+ #     and quorum.
 -[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
 +[ -z "$FENCE_JOIN" ] && FENCE_JOIN="no"
  

diff --git a/debian/patches/fix-cpglockd-init.diff b/debian/patches/fix-cpglockd-init.diff
new file mode 100644 (file)
index 0000000..152c974
--- /dev/null
+++ b/debian/patches/fix-cpglockd-init.diff
@@ -0,0 +1,54 @@
+Index: new/rgmanager/init.d/cpglockd.in
+===================================================================
+--- new.orig/rgmanager/init.d/cpglockd.in      2012-06-13 16:17:08.000000000 +0200
++++ new/rgmanager/init.d/cpglockd.in   2012-06-13 16:25:43.000000000 +0200
+@@ -6,10 +6,10 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides:           cpglockd
+-# Required-Start:     cman
+-# Required-Stop:      cman
+-# Default-Start:
+-# Default-Stop:
++# Required-Start:     $remote_fs cman
++# Required-Stop:      $remote_fs cman
++# Default-Start:        2 3 4 5
++# Default-Stop:         0 1 6
+ # Short-Description:  Starts and stops the CPG lock daemon
+ # Description:                Starts and stops the CPG lock daemon
+ ### END INIT INFO
+@@ -53,9 +53,7 @@
+ 
+ # deb based distros
+ if [ -d /etc/default ]; then
+-      [ -f /etc/default/cluster ] && . /etc/default/cluster
+-      [ -f /etc/default/rgmanager ] && . /etc/default/rgmanager
+-      [ -f /etc/default/cpglockd ] && . /etc/default/cpglockd
++      [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
+       [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cpglockd"
+ fi
+ 
+@@ -70,6 +68,11 @@
+       kill -TERM $(pidof $CPGLOCKD)
+ }
+ 
++rgmanager_enabled()
++{
++      ccs_tool query /cluster/rm >/dev/null 2>&1
++}
++
+ rtrn=0
+ 
+ if [ "$EUID" != "0" ]; then
+@@ -79,6 +82,11 @@
+ 
+ case "$1" in
+ start)
++
++      if ! rgmanager_enabled; then
++          exit 0;
++      fi
++
+       echo -n "Starting $ID: "
+ 
+       # most recent distributions use tmpfs for /var/run

diff --git a/debian/patches/fix-lsb-header.diff b/debian/patches/fix-lsb-header.diff
index 813b0f048bca6c3f2f4221d3b069a94c3754bd36..0447393efcd735b4065f7b3defc97aa75ac08b21 100644 (file)
--- a/debian/patches/fix-lsb-header.diff
+++ b/debian/patches/fix-lsb-header.diff
@@ -1,7 +1,7 @@
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2011-08-30 11:58:11.000000000 +0200
-+++ new/cman/init.d/cman.in    2011-08-30 11:58:46.000000000 +0200
+--- new.orig/cman/init.d/cman.in       2012-06-13 15:55:37.000000000 +0200
++++ new/cman/init.d/cman.in    2012-06-13 15:56:41.000000000 +0200
 @@ -8,10 +8,10 @@
  #
  ### BEGIN INIT INFO
@@ -17,9 +17,9 @@ Index: new/cman/init.d/cman.in
  # Short-Description:  Starts and stops cman
  # Description:                Starts and stops the Cluster Manager set of daemons
  ### END INIT INFO
-@@ -19,7 +19,10 @@
- # set secure PATH
- PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+@@ -22,7 +22,10 @@
+ # save invokation for rollback ops
+ thisinvokation="$0"
  
 +CCFG="/etc/cluster/cluster.conf"
 +
@@ -28,7 +28,7 @@ Index: new/cman/init.d/cman.in
  
  chkconfig2()
  {
-@@ -68,8 +71,7 @@
+@@ -71,8 +74,7 @@
  
  # deb based distros
  if [ ! -d /etc/sysconfig ]; then

diff --git a/debian/patches/fix-rgmanager-init.diff b/debian/patches/fix-rgmanager-init.diff
index 17c32ddbe13847350ec81b63729d6d8d60367db5..f2b1c862fce988130123cc256c9ba96793a24c3d 100644 (file)
--- a/debian/patches/fix-rgmanager-init.diff
+++ b/debian/patches/fix-rgmanager-init.diff
@@ -1,17 +1,17 @@
 Index: new/rgmanager/init.d/rgmanager.in
 ===================================================================
---- new.orig/rgmanager/init.d/rgmanager.in     2011-09-29 11:01:03.000000000 +0200
-+++ new/rgmanager/init.d/rgmanager.in  2011-09-29 11:08:55.000000000 +0200
+--- new.orig/rgmanager/init.d/rgmanager.in     2012-06-13 15:50:21.000000000 +0200
++++ new/rgmanager/init.d/rgmanager.in  2012-06-13 15:58:49.000000000 +0200
 @@ -6,10 +6,10 @@
  #
  ### BEGIN INIT INFO
  # Provides:           rgmanager
--# Required-Start:     cman
--# Required-Stop:      cman
+-# Required-Start:     cman cpglockd
+-# Required-Stop:      cman cpglockd
 -# Default-Start:
 -# Default-Stop:
-+# Required-Start:     $remote_fs cman
-+# Required-Stop:      $remote_fs cman
++# Required-Start:     $remote_fs cman cpglockd
++# Required-Stop:      $remote_fs cman cpglockd
 +# Default-Start:        2 3 4 5
 +# Default-Stop:         0 1 6
  # Short-Description:  Starts and stops Red Hat Service (resource group) Manager
@@ -38,8 +38,8 @@ Index: new/rgmanager/init.d/rgmanager.in
        [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/rgmanager"
  fi
  
-@@ -72,6 +75,11 @@
-       done
+@@ -82,6 +85,11 @@
+               while ! cpglockdump > /dev/null 2>&1; do sleep 1; done
  }
  
 +rgmanager_enabled()
@@ -50,7 +50,7 @@ Index: new/rgmanager/init.d/rgmanager.in
  rtrn=0
  
  if [ "$EUID" != "0" ]; then
-@@ -81,6 +89,11 @@
+@@ -91,6 +99,11 @@
  
  case "$1" in
  start)
@@ -62,7 +62,7 @@ Index: new/rgmanager/init.d/rgmanager.in
        echo -n "Starting $ID: "
  
        # most recent distributions use tmpfs for /var/run
-@@ -92,7 +105,9 @@
+@@ -107,7 +120,9 @@
        if status $RGMGRD > /dev/null 2>&1; then
                success
        else
@@ -73,7 +73,7 @@ Index: new/rgmanager/init.d/rgmanager.in
                        touch $LOCK_FILE
                        success
                else
-@@ -126,11 +141,12 @@
+@@ -141,11 +156,12 @@
        echo -n "Stopping $ID: "
  
        if status $RGMGRD > /dev/null 2>&1; then

diff --git a/debian/patches/series b/debian/patches/series
index 1b3a2e52930a5c82033782fc8114d28ac5efa82f..04a280742c1ab6816230705ca5ca2e9c8bc48822 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix-rgmanager-init.diff
 fix-startup-config-timeout.diff
 #fix-quorum-wait-time.diff
 fix-cluster-schema.diff
+fix-cpglockd-init.diff

diff --git a/debian/redhat-cluster-pve.default b/debian/redhat-cluster-pve.default
index 857e0957ea51e5e9787eddee613270a4c0557d33..f34b7f49e103a2aa5e8b5545c126ae809f5c13d0 100644 (file)
--- a/debian/redhat-cluster-pve.default
+++ b/debian/redhat-cluster-pve.default
@@ -1,8 +1,6 @@
-# CLUSTERNAME=""
-# NODENAME=""
-# USE_CCS="yes"
-# CLUSTER_JOIN_TIMEOUT=300
-# CLUSTER_JOIN_OPTIONS=""
-# CLUSTER_SHUTDOWN_TIMEOUT=60
-# RGMGR_OPTIONS=""
+# this file is sourced by the following init scripts:
+# /etc/init.d/cpglockd
+# /etc/init.d/cman
+# /etc/init.d/rgmanager
+
 # FENCE_JOIN="yes"

diff --git a/debian/redhat-cluster-pve.install b/debian/redhat-cluster-pve.install
index 7d2f8da2f9c139cb57292b15368a0ad7933d5cd8..143bf151f08cd42487229b6207aaa99b929a4fa0 100644 (file)
--- a/debian/redhat-cluster-pve.install
+++ b/debian/redhat-cluster-pve.install
@@ -5,6 +5,7 @@ usr/share/cluster/*
 usr/share/man/man5/*
 usr/share/man/man8/*
 etc/init.d/cman
+etc/init.d/cpglockd
 etc/init.d/rgmanager
 etc/logrotate.d/cluster
 lib/udev/rules.d/51-dlm.rules

diff --git a/debian/redhat-cluster-pve.postinst b/debian/redhat-cluster-pve.postinst
index d7b406e1355d3ffe671b12cf09fc397d9dc9b0b8..b4727e39c6d280bb04d7cb64513e8b7d82466bb1 100644 (file)
--- a/debian/redhat-cluster-pve.postinst
+++ b/debian/redhat-cluster-pve.postinst
@@ -34,6 +34,9 @@ esac
 if [ -x "/etc/init.d/cman" ]; then
         update-rc.d cman start 21 2 3 4 5 . stop 79 0 1 6 . >/dev/null || exit $?
 fi
+if [ -x "/etc/init.d/cpglockd" ]; then
+        update-rc.d cpglockd start 98 2 3 4 5 . stop 2 0 1 6 . >/dev/null || exit $?
+fi
 if [ -x "/etc/init.d/rgmanager" ]; then
         update-rc.d rgmanager start 99 2 3 4 5 . stop 1 0 1 6 . >/dev/null || exit $?
 fi

diff --git a/debian/redhat-cluster-pve.postrm b/debian/redhat-cluster-pve.postrm
index 8f525b5257624d40c954cb77a86e430b136cae4c..629886628ef68dd18c23d3fa1e0c058789e8dcdf 100644 (file)
--- a/debian/redhat-cluster-pve.postrm
+++ b/debian/redhat-cluster-pve.postrm
@@ -23,6 +23,7 @@ case "$1" in
     purge)
        update-rc.d cman remove >/dev/null || exit $?
        update-rc.d rgmanager remove >/dev/null || exit $?
+       update-rc.d cpglockd remove >/dev/null || exit $?
     ;;
 
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)