From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 15 Jun 2012 09:45:46 +0000 (+0200)
Subject: do not start cpglockd service
X-Git-Url: https://git.proxmox.com/?p=redhat-cluster-pve.git;a=commitdiff_plain;h=929d4744f674b598cd8b40c4d47204c1a0c6bdaf;ds=sidebyside

do not start cpglockd service

This init script is called from /etc/init.d/rgmanager when required.
---

diff --git a/Makefile b/Makefile
index f9382cf..0c0c210 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-RELEASE=2.0
+RELEASE=2.1
 
 RHCVER=3.1.92
 RHCBRANCH=origin/STABLE32
diff --git a/debian/patches/fix-cpglockd-init.diff b/debian/patches/fix-cpglockd-init.diff
index 152c974..51db996 100644
--- a/debian/patches/fix-cpglockd-init.diff
+++ b/debian/patches/fix-cpglockd-init.diff
@@ -1,22 +1,18 @@
 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 @@
+--- new.orig/rgmanager/init.d/cpglockd.in	2012-06-14 17:38:33.000000000 +0200
++++ new/rgmanager/init.d/cpglockd.in	2012-06-15 11:43:20.000000000 +0200
+@@ -6,8 +6,8 @@
  #
  ### 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
+ # Default-Start:
+ # Default-Stop:
  # 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
diff --git a/debian/patches/fix-rgmanager-init.diff b/debian/patches/fix-rgmanager-init.diff
index f2b1c86..31e39b4 100644
--- a/debian/patches/fix-rgmanager-init.diff
+++ b/debian/patches/fix-rgmanager-init.diff
@@ -1,7 +1,7 @@
 Index: new/rgmanager/init.d/rgmanager.in
 ===================================================================
---- 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
+--- new.orig/rgmanager/init.d/rgmanager.in	2012-06-14 17:38:33.000000000 +0200
++++ new/rgmanager/init.d/rgmanager.in	2012-06-15 11:41:09.000000000 +0200
 @@ -6,10 +6,10 @@
  #
  ### BEGIN INIT INFO
@@ -10,8 +10,8 @@ Index: new/rgmanager/init.d/rgmanager.in
 -# Required-Stop:	cman cpglockd
 -# Default-Start:
 -# Default-Stop:
-+# Required-Start:	$remote_fs cman cpglockd
-+# Required-Stop:	$remote_fs cman cpglockd
++# 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 Red Hat Service (resource group) Manager
diff --git a/debian/redhat-cluster-pve.postinst b/debian/redhat-cluster-pve.postinst
index b4727e3..d7b406e 100644
--- a/debian/redhat-cluster-pve.postinst
+++ b/debian/redhat-cluster-pve.postinst
@@ -34,9 +34,6 @@ 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 6298866..8f525b5 100644
--- a/debian/redhat-cluster-pve.postrm
+++ b/debian/redhat-cluster-pve.postrm
@@ -23,7 +23,6 @@ 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)