fix patches for 3.1.93

diff --git a/debian/patches/do-not-stop-when-start-fails.patch b/debian/patches/do-not-stop-when-start-fails.patch
index 7adc7416ef2e702e2fcef04dc1016b58ff210300..b457359323cf9c12d9f64c8ba56718d3ea31f080 100644 (file)
--- a/debian/patches/do-not-stop-when-start-fails.patch
+++ b/debian/patches/do-not-stop-when-start-fails.patch
@@ -5,9 +5,9 @@ Revert commit 65a0eef71377d2de4ad94e8f20065c4467a441e9 form upstream. We want to
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2012-08-14 07:23:53.000000000 +0200
-+++ new/cman/init.d/cman.in    2012-08-14 07:24:13.000000000 +0200
-@@ -210,9 +210,9 @@
+--- new.orig/cman/init.d/cman.in       2012-10-02 11:07:02.000000000 +0200
++++ new/cman/init.d/cman.in    2012-10-02 11:07:38.000000000 +0200
+@@ -231,9 +231,9 @@
        echo -e "$errmsg"
        failure
        echo

diff --git a/debian/patches/fix-cluster-schema.diff b/debian/patches/fix-cluster-schema.diff
index 1fd6340133872cfd9892d33bfb0c8ddfd5b77a60..6ad69ea8b315bafefb4fed0f798316246f27ada5 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      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 @@
+--- new.orig/config/tools/xml/cluster.rng.in.head      2012-10-02 10:58:00.000000000 +0200
++++ new/config/tools/xml/cluster.rng.in.head   2012-10-02 11:07:54.000000000 +0200
+@@ -998,6 +998,9 @@
     <zeroOrMore>
      <ref name="VM"/>
     </zeroOrMore>

diff --git a/debian/patches/fix-cman-init.diff b/debian/patches/fix-cman-init.diff
index 046568967005fb1d899fc5c5143c5b7aa9e83578..405f702e357a87a3e12f94f584a018e6a2c7bd66 100644 (file)
--- a/debian/patches/fix-cman-init.diff
+++ b/debian/patches/fix-cman-init.diff
@@ -3,8 +3,8 @@
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- 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
+--- new.orig/cman/init.d/cman.in       2012-10-02 10:58:00.000000000 +0200
++++ new/cman/init.d/cman.in    2012-10-02 11:07:02.000000000 +0200
 @@ -22,6 +22,8 @@
  # save invokation for rollback ops
  thisinvokation="$0"
@@ -14,10 +14,10 @@ Index: new/cman/init.d/cman.in
  chkconfig2()
  {
        case "$1" in
-@@ -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.
+@@ -146,7 +148,7 @@
+ #     DLM_CONTROLD_OPTS="-f0" (at least) for correct operation.
+ #     Please note that clusters without fencing are not 
+ #     supported by Red Hat except for MRG installations.
 -[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
 +[ -z "$FENCE_JOIN" ] && FENCE_JOIN="no"