fix bug #112 and #238

diff --git a/Makefile b/Makefile
index 39184e78e64901eb105708a2e9bb05e65e773642..78daba0abe88d36ea9a13f476d1b338cfd54fc2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=2
+PKGREL=3
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \

diff --git a/debian/changelog b/debian/changelog
index 405c83cd521fba62dc26a478b9804cca3ade045a..10b5949dd997165ad29b53f501dba133922ceccc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+redhat-cluster-pve (3.1.92-3) unstable; urgency=low
+
+  * fix bug #238: do not stop cman when not quorate
+  
+  * fix bug #112: correctly determine Linux distribution
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 14 Aug 2012 07:38:57 +0200
+
 redhat-cluster-pve (3.1.92-2) unstable; urgency=low
 
   * include patch from Fabio to fix config reload problems

diff --git a/debian/patches/do-not-stop-when-start-fails.patch b/debian/patches/do-not-stop-when-start-fails.patch
new file mode 100644 (file)
index 0000000..7adc741
--- /dev/null
+++ b/debian/patches/do-not-stop-when-start-fails.patch
@@ -0,0 +1,22 @@
+fix bug #238
+
+Revert commit 65a0eef71377d2de4ad94e8f20065c4467a441e9 form upstream. We want to keep cman running even when we do not get quorum.
+
+
+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 @@
+       echo -e "$errmsg"
+       failure
+       echo
+-      if [ "$currentaction" = "start" ]; then
+-              $thisinvokation stop
+-      fi
++#     if [ "$currentaction" = "start" ]; then
++#             $thisinvokation stop
++#     fi
+       exit 1
+ }
+ 

diff --git a/debian/patches/fix-dist-detection.patch b/debian/patches/fix-dist-detection.patch
new file mode 100644 (file)
index 0000000..736d9ce
--- /dev/null
+++ b/debian/patches/fix-dist-detection.patch
@@ -0,0 +1,66 @@
+fix bug #112: we know that we run on debian
+
+So we can simple remove those unreliable tests. 
+
+Index: new/cman/init.d/cman.in
+===================================================================
+--- new.orig/cman/init.d/cman.in       2012-08-14 07:26:22.000000000 +0200
++++ new/cman/init.d/cman.in    2012-08-14 07:28:35.000000000 +0200
+@@ -63,17 +63,8 @@
+       return $statusrtrn
+ }
+ 
+-# rpm based distros
+-if [ -d /etc/sysconfig ]; then
+-      [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
+-      [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+-      [ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman
+-      [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/cman"
+-      netmanager=NetworkManager
+-fi
+-
+ # deb based distros
+-if [ ! -d /etc/sysconfig ]; then
++if [ -d /etc/default ]; then
+       [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
+       [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cman"
+       netmanager=network-manager
+Index: new/rgmanager/init.d/cpglockd.in
+===================================================================
+--- new.orig/rgmanager/init.d/cpglockd.in      2012-08-14 07:26:47.000000000 +0200
++++ new/rgmanager/init.d/cpglockd.in   2012-08-14 07:27:23.000000000 +0200
+@@ -42,15 +42,6 @@
+       return $statusrtrn
+ }
+ 
+-# rpm based distros
+-if [ -d /etc/sysconfig ]; then
+-      [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
+-      [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+-      [ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager
+-      [ -f /etc/sysconfig/cpglockd ] && . /etc/sysconfig/cpglockd
+-      [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/cpglockd"
+-fi
+-
+ # deb based distros
+ if [ -d /etc/default ]; then
+       [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
+Index: new/rgmanager/init.d/rgmanager.in
+===================================================================
+--- new.orig/rgmanager/init.d/rgmanager.in     2012-08-14 07:26:32.000000000 +0200
++++ new/rgmanager/init.d/rgmanager.in  2012-08-14 07:27:42.000000000 +0200
+@@ -46,14 +46,6 @@
+       return $statusrtrn
+ }
+ 
+-# rpm based distros
+-if [ -d /etc/sysconfig ]; then
+-      [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
+-      [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+-      [ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager
+-      [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/rgmanager"
+-fi
+-
+ # deb based distros
+ if [ -d /etc/default ]; then
+       [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve

diff --git a/debian/patches/series b/debian/patches/series
index 04a280742c1ab6816230705ca5ca2e9c8bc48822..5e1a028740425e1f41b2739e252e1a41feb6a9aa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,9 +3,11 @@
 #change-confdir.diff
 #enable-gfs.diff
 fix-cman-init.diff
+do-not-stop-when-start-fails.patch
 fix-lsb-header.diff
 fix-rgmanager-init.diff
 fix-startup-config-timeout.diff
 #fix-quorum-wait-time.diff
 fix-cluster-schema.diff
 fix-cpglockd-init.diff
+fix-dist-detection.patch