update to STABLE32 3.1.92

[redhat-cluster-pve.git] / debian / patches / fix-rgmanager-init.diff

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