[kernel] r12350 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

[Frederik Schüler]

Author: fs
Date: Mon Oct 20 10:09:41 2008
New Revision: 12350

Log:
Add dependency on python-pexpect and install missing fencing scripts. (Closes: #497423)
Fix RedHat specific service calls in nfsexport resource script. (Closes: #498993)



Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_redhadism_fix.dpatch   (contents, props changed)
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.install
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog	Mon Oct 20 10:09:41 2008
@@ -1,3 +1,12 @@
+redhat-cluster (2.20080801-4) unstable; urgency=high
+
+  * Add dependency on python-pexpect and install missing fencing 
+    scripts. (Closes: #497423)
+  * Fix RedHat specific service calls in nfsexport resource script. 
+    (Closes: #498993)
+
+ -- Frederik Schüler <fs at debian.org>  Mon, 20 Oct 2008 11:16:36 +0200
+
 redhat-cluster (2.20080801-3) unstable; urgency=high
 
   * Fix gfs1 filesystem corruption. (Closes: #502081)

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.install
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.install	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.install	Mon Oct 20 10:09:41 2008
@@ -24,3 +24,4 @@
 usr/sbin/groupd
 usr/sbin/fence*
 usr/share/man/man8/fence*
+usr/share/fence/*

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control	Mon Oct 20 10:09:41 2008
@@ -25,7 +25,7 @@
 Architecture: any
 Section: admin
 Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, python, openais (>= 0.83), libnet-snmp-perl, libnet-telnet-perl
+Depends: ${shlibs:Depends}, python, openais (>= 0.83), libnet-snmp-perl, libnet-telnet-perl, python-pexpect
 Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev, fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
 Replaces: ccs, fence, fence-gnbd
 Description: Red Hat cluster suite - cluster manager

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list	Mon Oct 20 10:09:41 2008
@@ -1,2 +1,3 @@
 01_qdisk-uninitialized.dpatch
 02_gfs-kernel-fix.dpatch
+03_redhadism_fix.dpatch

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_redhadism_fix.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/patches/03_redhadism_fix.dpatch	Mon Oct 20 10:09:41 2008
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_redhadism_fix.dpatch by Frederik Schüler <fs at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use invoke-rc.d instead of /sbin/service and adapt init script names.
+
+ at DPATCH@
+--- redhat-cluster-2.20080801/rgmanager/src/resources/nfsexport.sh.old	2008-10-20 11:19:26.000000000 +0200
++++ redhat-cluster-2.20080801/rgmanager/src/resources/nfsexport.sh	2008-10-20 11:20:58.000000000 +0200
+@@ -184,10 +184,10 @@
+ 		
+   	ocf_log err "Restarting NFS daemons"
+ 	# Note restart does less than stop/start
+-	junk=$(/sbin/service nfslock stop)
+-	junk=$(/sbin/service nfslock start)
+-	junk=$(/sbin/service nfs stop)
+-	junk=$(/sbin/service nfs start)
++	junk=$(invoke-rc.d nfs-common stop)
++	junk=$(invoke-rc.d nfs-common start)
++	junk=$(invoke-rc.d nfs-kernel-server stop)
++	junk=$(invoke-rc.d nfs-kernel-server start)
+ 	sleep 2
+ 	
+ 	if ! nfs_daemons_running; then