From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 30 Aug 2011 13:23:08 +0000 (+0200)
Subject: Fix startup order
X-Git-Url: https://git.proxmox.com/?p=redhat-cluster-pve.git;a=commitdiff_plain;h=f32778ad525bc3cdb6f702c21f8c31f64313f262

Fix startup order

And do not install useless docs.
---

diff --git a/debian/patches/fix-lsb-header.diff b/debian/patches/fix-lsb-header.diff
index 84cc6c6..813b0f0 100644
--- a/debian/patches/fix-lsb-header.diff
+++ b/debian/patches/fix-lsb-header.diff
@@ -1,7 +1,7 @@
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in	2010-12-02 07:34:43.000000000 +0100
-+++ new/cman/init.d/cman.in	2010-12-17 15:22:32.000000000 +0100
+--- new.orig/cman/init.d/cman.in	2011-08-30 11:58:11.000000000 +0200
++++ new/cman/init.d/cman.in	2011-08-30 11:58:46.000000000 +0200
 @@ -8,10 +8,10 @@
  #
  ### BEGIN INIT INFO
@@ -10,10 +10,10 @@ Index: new/cman/init.d/cman.in
 -# Required-Stop:	$network $time
 -# Default-Start:
 -# Default-Stop:
-+# Required-Start:	pve-cluster
-+# Required-Stop:	pve-cluster
-+# Default-Start:        S
-+# Default-Stop:         0 6
++# Required-Start:	$remote_fs pve-cluster
++# Required-Stop:	$remote_fs pve-cluster
++# Default-Start:        2 3 4 5
++# Default-Stop:         0 1 6
  # Short-Description:	Starts and stops cman
  # Description:		Starts and stops the Cluster Manager set of daemons
  ### END INIT INFO
diff --git a/debian/patches/fix-rgmanager-init.diff b/debian/patches/fix-rgmanager-init.diff
index 53525e8..91e3817 100644
--- a/debian/patches/fix-rgmanager-init.diff
+++ b/debian/patches/fix-rgmanager-init.diff
@@ -1,15 +1,19 @@
 Index: new/rgmanager/init.d/rgmanager.in
 ===================================================================
---- new.orig/rgmanager/init.d/rgmanager.in	2011-07-19 12:52:29.000000000 +0200
-+++ new/rgmanager/init.d/rgmanager.in	2011-08-19 10:26:15.000000000 +0200
-@@ -8,8 +8,8 @@
+--- new.orig/rgmanager/init.d/rgmanager.in	2011-08-25 07:31:44.000000000 +0200
++++ new/rgmanager/init.d/rgmanager.in	2011-08-30 11:57:34.000000000 +0200
+@@ -6,10 +6,10 @@
+ #
+ ### BEGIN INIT INFO
  # Provides:		rgmanager
- # Required-Start:	cman
- # Required-Stop:	cman
+-# Required-Start:	cman
+-# Required-Stop:	cman
 -# Default-Start:
 -# Default-Stop:
-+# Default-Start:        S
-+# Default-Stop:         0 6
++# 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
  # Description:		Starts and stops Red Hat Service (resource group) Manager
  ### END INIT INFO
diff --git a/debian/redhat-cluster-pve.docs b/debian/redhat-cluster-pve.docs
deleted file mode 100644
index 9e7e8cc..0000000
--- a/debian/redhat-cluster-pve.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-doc/COPYING.applications
-doc/COPYING.libraries
-doc/usage.txt
-rgmanager/errors.txt
diff --git a/debian/redhat-cluster-pve.postinst b/debian/redhat-cluster-pve.postinst
index 6757882..d7b406e 100644
--- a/debian/redhat-cluster-pve.postinst
+++ b/debian/redhat-cluster-pve.postinst
@@ -32,13 +32,10 @@ case "$1" in
 esac
 
 if [ -x "/etc/init.d/cman" ]; then
-        update-rc.d cman start 61 S . start 5 0 6 . >/dev/null || exit $?
-fi
-if [ -x "/etc/init.d/gfs2" ]; then
-        update-rc.d gfs2 start 65 S . start 2 0 6 . >/dev/null || exit $?
+        update-rc.d cman start 21 2 3 4 5 . stop 79 0 1 6 . >/dev/null || exit $?
 fi
 if [ -x "/etc/init.d/rgmanager" ]; then
-        update-rc.d rgmanager start 65 S . start 1 0 6 . >/dev/null || exit $?
+        update-rc.d rgmanager start 99 2 3 4 5 . stop 1 0 1 6 . >/dev/null || exit $?
 fi
 
 # dh_installdeb will replace this with shell code automatically
diff --git a/debian/redhat-cluster-pve.postrm b/debian/redhat-cluster-pve.postrm
index 4f0c6d9..8f525b5 100644
--- a/debian/redhat-cluster-pve.postrm
+++ b/debian/redhat-cluster-pve.postrm
@@ -22,7 +22,6 @@ set -e
 case "$1" in
     purge)
 	update-rc.d cman remove >/dev/null || exit $?
-	update-rc.d gfs2 remove >/dev/null || exit $?
 	update-rc.d rgmanager remove >/dev/null || exit $?
     ;;