From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 2 Oct 2012 09:12:12 +0000 (+0200)
Subject: fix patches for 3.1.93
X-Git-Url: https://git.proxmox.com/?p=redhat-cluster-pve.git;a=commitdiff_plain;h=b3295b8c944df6c7682ce839e47b6438b9433d99

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 7adc741..b457359 100644
--- 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 1fd6340..6ad69ea 100644
--- 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 0465689..405f702 100644
--- 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"