stop open-iscsi after cman

For example, qdisk is quite often on iscsi volumes.

diff --git a/Makefile b/Makefile
index 0f5ad62fecdbda250e2c935024c795d29165f6ab..30d26ae4a83d9ac9e743c96923194526319a79d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=1
+PKGREL=2
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \

diff --git a/debian/changelog b/debian/changelog
index cfa40fb36049a94fbd6f791f9677ea4548958758..d31b178fd22342421c7bfd1cd794b0885be919fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+redhat-cluster-pve (3.1.93-2) unstable; urgency=low
+
+  * correct init script dependency, so that open-iscsi is stopped after
+    cman.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 14 Nov 2012 06:26:12 +0100
+
 redhat-cluster-pve (3.1.93-1) unstable; urgency=low
 
   * update to STABLE32 3.1.93

diff --git a/debian/patches/fix-lsb-header.diff b/debian/patches/fix-lsb-header.diff
index 0447393efcd735b4065f7b3defc97aa75ac08b21..8c40ac67b70a086a3592d9116be6186ac654d4e3 100644 (file)
--- a/debian/patches/fix-lsb-header.diff
+++ b/debian/patches/fix-lsb-header.diff
@@ -1,8 +1,8 @@
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2012-06-13 15:55:37.000000000 +0200
-+++ new/cman/init.d/cman.in    2012-06-13 15:56:41.000000000 +0200
-@@ -8,10 +8,10 @@
+--- new.orig/cman/init.d/cman.in       2012-11-14 06:12:44.000000000 +0100
++++ new/cman/init.d/cman.in    2012-11-14 06:33:35.000000000 +0100
+@@ -8,10 +8,11 @@
  #
  ### BEGIN INIT INFO
  # Provides:           cman
@@ -12,12 +12,13 @@ Index: new/cman/init.d/cman.in
 -# Default-Stop:
 +# Required-Start:     $remote_fs pve-cluster
 +# Required-Stop:      $remote_fs pve-cluster
++# Should-Stop:                iscsi umountiscsi.sh
 +# 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
-@@ -22,7 +22,10 @@
+@@ -22,7 +23,10 @@
  # save invokation for rollback ops
  thisinvokation="$0"
  
@@ -28,7 +29,7 @@ Index: new/cman/init.d/cman.in
  
  chkconfig2()
  {
-@@ -71,8 +74,7 @@
+@@ -71,8 +75,7 @@
  
  # deb based distros
  if [ ! -d /etc/sysconfig ]; then