[pve-devel] r5370 - / redhat-cluster redhat-cluster/trunk redhat-cluster/trunk/debian redhat-cluster/trunk/debian/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Jan 13 06:24:45 CET 2011


Author: dietmar
Date: 2011-01-13 06:24:45 +0100 (Thu, 13 Jan 2011)
New Revision: 5370

Added:
   redhat-cluster/
   redhat-cluster/trunk/
   redhat-cluster/trunk/Makefile
   redhat-cluster/trunk/README
   redhat-cluster/trunk/debian/
   redhat-cluster/trunk/debian/changelog
   redhat-cluster/trunk/debian/compat
   redhat-cluster/trunk/debian/control
   redhat-cluster/trunk/debian/copyright
   redhat-cluster/trunk/debian/patches/
   redhat-cluster/trunk/debian/patches/change-confdir.diff
   redhat-cluster/trunk/debian/patches/disable-xvm-fence.diff
   redhat-cluster/trunk/debian/patches/enable-gfs.diff
   redhat-cluster/trunk/debian/patches/fix-cman-init.diff
   redhat-cluster/trunk/debian/patches/fix-lsb-header.diff
   redhat-cluster/trunk/debian/patches/fix-startup-config-timeout.diff
   redhat-cluster/trunk/debian/patches/remove-udev-break.diff
   redhat-cluster/trunk/debian/patches/series
   redhat-cluster/trunk/debian/redhat-cluster-pve-dev.install
   redhat-cluster/trunk/debian/redhat-cluster-pve.default
   redhat-cluster/trunk/debian/redhat-cluster-pve.dirs
   redhat-cluster/trunk/debian/redhat-cluster-pve.docs
   redhat-cluster/trunk/debian/redhat-cluster-pve.examples
   redhat-cluster/trunk/debian/redhat-cluster-pve.install
   redhat-cluster/trunk/debian/redhat-cluster-pve.postinst
   redhat-cluster/trunk/debian/redhat-cluster-pve.postrm
   redhat-cluster/trunk/debian/rules
Log:
moved from private repository


Added: redhat-cluster/trunk/Makefile
===================================================================
--- redhat-cluster/trunk/Makefile	                        (rev 0)
+++ redhat-cluster/trunk/Makefile	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,41 @@
+RELEASE=2.0
+
+RHCVER=3.1.0
+RHCBRANCH=origin/STABLE31
+
+PACKAGE=redhat-cluster-pve
+PKGREL=1
+
+DEBS=									\
+	${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb			\
+	${PACKAGE}-dev_${RHCVER}-${PKGREL}_amd64.deb
+
+all: ${DEBS}
+	echo ${DEBS}
+
+.PHONY: cluster-${RHCVER}
+${DEBS} cluster-${RHCVER}: cluster.git
+	rm -rf cluster-${RHCVER}
+	rsync -a --exclude .git --exclude .gitignore cluster.git/ cluster-${RHCVER}
+	cp -a debian cluster-${RHCVER}/debian
+	cd cluster-${RHCVER}; dpkg-buildpackage -rfakeroot -b -us -uc
+
+cluster.git download:
+	git clone git://git.fedorahosted.org/cluster.git cluster.git
+	cd cluster.git; git checkout -b local ${RHCBRANCH}
+
+.PHONY: upload
+upload: ${DEBS}
+	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
+	mkdir -p /pve/${RELEASE}/extra
+	rm -f /pve/${RELEASE}/extra/${PACKAGE}*.deb
+	rm -f /pve/${RELEASE}/extra/Packages*
+	cp ${DEBS} /pve/${RELEASE}/extra
+	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
+	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+
+distclean: clean
+	rm -rf cluster.git
+
+clean:
+	rm -rf *~ *.deb cluster-${RHCVER} ${PACKAGE}_* ${PACKAGE}-dev_* 
\ No newline at end of file

Added: redhat-cluster/trunk/README
===================================================================
--- redhat-cluster/trunk/README	                        (rev 0)
+++ redhat-cluster/trunk/README	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,7 @@
+See http://sources.redhat.com/cluster/wiki/
+
+Sources from:
+
+http://git.fedorahosted.org/git/cluster.git
+
+

Added: redhat-cluster/trunk/debian/changelog
===================================================================
--- redhat-cluster/trunk/debian/changelog	                        (rev 0)
+++ redhat-cluster/trunk/debian/changelog	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,30 @@
+redhat-cluster-pve (3.1.0-1) unstable; urgency=low
+
+  * update to latest stable 3.1.0
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 02 Dec 2010 07:18:34 +0100
+
+redhat-cluster-pve (3.0.17-1) unstable; urgency=low
+
+  * update to latest stable 3.0.17
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 12 Oct 2010 12:24:08 +0200
+
+redhat-cluster-pve (3.0.16-1) unstable; urgency=low
+
+  * update to latest stable 3.0.16
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 06 Oct 2010 14:01:03 +0200
+
+redhat-cluster-pve (3.0.8-1) unstable; urgency=low
+
+  * update to latest stable 3.0.8
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 24 Feb 2010 10:13:41 +0100
+
+redhat-cluster-pve (3.0.7-1) unstable; urgency=low
+
+  [ Proxmox Support Team ]
+  * Initial release
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 18 Feb 2010 13:22:30 +0100

Added: redhat-cluster/trunk/debian/compat
===================================================================
--- redhat-cluster/trunk/debian/compat	                        (rev 0)
+++ redhat-cluster/trunk/debian/compat	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1 @@
+7

Added: redhat-cluster/trunk/debian/control
===================================================================
--- redhat-cluster/trunk/debian/control	                        (rev 0)
+++ redhat-cluster/trunk/debian/control	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,38 @@
+Source: redhat-cluster-pve
+Section: admin
+Priority: optional
+Maintainer: Proxmox Support Team <support at proxmox.com>
+Standards-Version: 3.8.3
+Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7), autotools-dev, 
+ libxml2-dev, libncurses5-dev, linux-libc-dev, 
+ libnss3-dev, libnspr4-dev, bzip2, libslang2-dev, libldap2-dev, 
+ perl-modules,
+ libcorosync-pve-dev,
+ libopenais-pve-dev,
+ xsltproc,
+ python-pexpect,
+ python-pycurl
+
+Package: redhat-cluster-pve
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, 
+ ${python:Depends}, pve-cluster, corosync-pve,
+ openais-pve, python, openipmi, sg3-utils, python-pexpect, python-pycurl,
+ libnet-snmp-perl, libnet-telnet-perl, snmp, telnet, openssh-client,
+ python-openssl, libxml2-utils
+Conflicts: cman, redhat-cluster-suite, gfs2-tools, rgmanager
+Description: Red Hat cluster suite
+ RHCS is a cluster management infrastructure, for building
+ high-availability multi-node clusters with service and IP failover on
+ top of shared Fibre Channel/iSCSI storage devices.
+
+
+Package: redhat-cluster-pve-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},  redhat-cluster-pve (= ${binary:Version})
+Description: Red Hat cluster suite - cluster manager development files
+ This package is part of the Red Hat Cluster Suite, a complete
+ high-availability solution.
+ .
+ This package contains the files needed for developing applications.

Added: redhat-cluster/trunk/debian/copyright
===================================================================
--- redhat-cluster/trunk/debian/copyright	                        (rev 0)
+++ redhat-cluster/trunk/debian/copyright	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,288 @@
+This work was packaged for Debian by:
+
+ Proxmox Support Team <support at proxmox.com> on Thu, 18 Feb 2010 13:20:10 +0100
+
+It was downloaded from <git://git.fedorahosted.org/cluster.git>
+
+*****
+
+From upstream README.licence:
+
+The Red Hat Cluster is a collection of free software built on top of different
+libraries and applications.
+
+For a detailed list of authors and copyright holders, please check the
+included COPYRIGHT file.
+
+Libraries:
+
+You can redistribute them and/or modify them under the terms of the GNU Lesser
+General Public License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+The libraries are distributed in the hope that they will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+details.
+
+Applications:
+
+You can redistribute them and/or modify them under the terms of the GNU General
+Public License as published by the Free Software Foundation; either version
+2 of the License, or (at your option) any later version.
+
+The applications are distributed in the hope that they will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details.
+
+A copy of each license is included for your convenience in COPYING.applications
+and COPYING.libraries.
+
+If missing, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301 USA.
+
+*****
+
+On Debian systems, the complete text of the GNU General Public License 
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+On Debian systems, the complete text of the GNU Lesser Public License 
+version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+*****
+
+From upstream COPYRIGHT file:
+
+Unless specified otherwise in the "exceptions section" below:
+
+Copyright (C) 1997-2003 Sistina Software, Inc.  All rights reserved.
+Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+
+Exceptions:
+
+cman/qdisk/crc32.c:
+ Copyright (C) 2000 Bryan Call <bc at fodder.org>
+ Modified by Lon H. Hohberger <lhh at redhat.com>
+ Copyright (C) 2003-2008 Red Hat, Inc.  All rights reserved.
+
+cman/qdisk/daemon_init.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <jmoyer at redhat.com>
+
+cman/qdisk/disk.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Tim Burke <tburke at redhat.com>
+
+cman/qdisk/scandisk.{c,h}:
+ Original design by: Joel Becker <Joel.Becker at oracle.com> and
+ Fabio M. Di Nitto <fdinitto at redhat.com>
+
+dlm/doc/example.c:
+ Author: Daniel Phillips <phillips at redhat.com>
+
+fence/agents/apc_snmp/powernet369.mib:
+ Copyright (c) 2005 American Power Conversion, Inc.
+ PowerNet is a Trademark of American Power Conversion Corp.
+
+fence/agents/ifmib/fence_ifmib.py:
+ Copyright (C) 2008 Ross Vandegrift.
+ Written by Ross Vandegrift <ross at kallisti.us>
+
+fence/agents/ipmilan/expect.{c,h}:
+ Copyright (C) 2000 Alan Robertson <alanr at unix.sh>
+
+fence/agents/vmware/fence_vmware.pl:
+ Author: Zach Lowry <zach at zachlowry.net>
+
+fence/agents/xvm/tcp.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <jmoyer at redhat.com>
+
+fence/man/fence_ifmib.8:
+ Copyright (C) 2008 Ross Vandegrift.
+ Written by Ross Vandegrift <ross at kallisti.us>
+
+gfs/man/gfs_mount.8:
+ Portions copyright (C) 2001-2003 The OpenGFS Project
+ Portions copyright (C) 2004 <ben.m.cahill at intel.com>
+ Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+
+gfs2/man/gfs2_mount.8:
+ Portions copyright (C) 2001-2003 The OpenGFS2 Project
+ Portions copyright (C) 2004 <ben.m.cahill at intel.com>
+ Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+
+gfs-kernel/src/gfs/fixed_div64.h:
+ Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
+  Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
+  Mountain View, CA  94043, or:
+  http://www.sgi.com
+  For further information regarding this notice, see:
+  http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+
+From rgmanager/AUTHORS:
+
+Lon Hohberger           lhh at redhat.com
+* Resource tree
+* Failover domains
+* Resource agent scripts
+
+Gregory Myrdal          [private]
+* Misc utilities
+* Resource agent scripts
+
+Jeff Moyer              jmoyer at redhat.com
+* Syslog wrapper & logging program
+
+Portions of this code (C) 2000-2001 Mission Critical Linux, Inc.
+
+rgmanager/include/clulog.h:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <moyer at missioncriticallinux.com>
+
+rgmanager/src/clulib/clulog.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <moyer at missioncriticallinux.com>
+
+rgmanager/src/clulib/daemon_init.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <moyer at missioncriticallinux.com>
+
+rgmanager/src/clulib/msgsimple.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/clulib/tmgr.c:
+ Copyright (C) 2006-2007 Crosswalk.
+ Copyright (C) 2007-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/clulib/wrap_lock.c:
+ Copyright (C) 2006-2007 Crosswalk.
+ Copyright (C) 2007-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/daemons/groups.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/daemons/main.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/utils/cluarp.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/utils/clubufflush.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Gregory P. Myrdal <Myrdal at MissionCriticalLinux.Com>
+
+rgmanager/src/utils/clufindhostname.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Richard Rabbat <rabbat at missioncriticallinux.com>
+
+rgmanager/src/utils/clulog.c:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author: Jeff Moyer <moyer at missioncriticallinux.com>
+
+rgmanager/src/utils/syscall.h
+ Copyright (C) 1995-1997 Olaf Kirch <okir at monad.swb.de>
+ Copyright (C) 1997-2003 Sistina Software, Inc.  All rights reserved.
+ Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+ 
+rgmanager/src/resources/ASEHAagent.sh:
+ Sybase Availability Agent for Red Hat Cluster v15.0.2
+ Copyright (C) - 2007
+ Sybase, Inc. All rights reserved.
+
+ Sybase Availability Agent for Red Hat Cluster v15.0.2 is licensed
+ under the GNU General Public License Version 2.
+
+ Author(s):
+  Jian-ping Hui <jphui at sybase.com>
+
+rgmanager/src/resources/clusterfs.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/resources/fs.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/resources/ip.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/resources/netfs.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/resources/netexport.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+
+rgmanager/src/resources/ocf-shellfuncs:
+ Copyright (C) 2004 SUSE LINUX AG, Lars Marowsky-Bree. All Rights Reserved.
+
+rgmanager/src/resources/oracledb.sh:
+ Author(s):
+  Hardy Merrill <hmerrill at redhat.com>
+  Michael Moon <Michael dot Moon at oracle.com>
+
+rgmanager/src/resources/SAPDatabase:
+ Author: Alexander Krauth
+ Copyright (C) 2006 Alexander Krauth
+
+rgmanager/src/resources/SAPInstance:
+ Author: Alexander Krauth
+ Copyright (C) 2006 Alexander Krauth
+
+rgmanager/src/resources/smb.sh:
+ Copyright (C) 2000 Mission Critical Linux
+ Copyright (C) 2002-2008 Red Hat, Inc.  All rights reserved.
+ Author(s):
+  Lon Hohberger (lhh at redhat.com)
+  Tim Burke (tburke at redhat.com)
+
+Authors as known by current RCS as of the time of writing:
+
+Abhijith Das <adas at redhat.com>
+Adam Manthei <amanthei at redhat.com>
+A. J. Lewis <alewis at redhat.com>
+Alasdair G. Kergon <agk at redhat.com>
+Andrew Price <andy at andrewprice.me.uk>
+Benjamin Marzinski <bmarzins at redhat.com>
+Bob Peterson <rpeterso at redhat.com>
+Chris Feist <cfeist at redhat.com>
+Christine Caulfield <ccaulfie at redhat.com>
+Daniel Phillips <phillips at redhat.com>
+David Teigland <teigland at redhat.com>
+Fabio M. Di Nitto <fdinitto at redhat.com>
+James Parsons <jparsons at redhat.com>
+Joel Becker <joel.becker at oracle.com>
+Jonathan Brassow <jbrassow at redhat.com>
+jparsons <jparsons at redhat.com>
+Ken Preslan <kpreslan at redhat.com>
+Lon Hohberger <lhh at redhat.com>
+Marc - A. Dahlhaus <mad at wol.de>
+Marek 'marx' Grac <mgrac at redhat.com>
+Mark Hlawatschek <hlawatschek at atix.de>
+Michael Conrad Tadpol Tilstra <mtilstra at redhat.com>
+Patrick Caulfield <pcaulfie at redhat.com>
+Robert Peterson <rpeterso at redhat.com>
+Ross Vandegrift <ross at kallisti.us>
+Ryan McCabe <rmccabe at redhat.com>
+Ryan O'Hara <rohara at redhat.com>
+Stanko Kupcevic <kupcevic at redhat.com>
+Steven Whitehouse <swhiteho at redhat.com>
+Wendy Cheng <wcheng at redhat.com>

Added: redhat-cluster/trunk/debian/patches/change-confdir.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/change-confdir.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/change-confdir.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,12 @@
+Index: cluster-3.0.6/debian/rules
+===================================================================
+--- cluster-3.0.6.orig/debian/rules	2010-02-01 13:37:05.000000000 +0100
++++ cluster-3.0.6/debian/rules	2010-02-01 13:38:12.000000000 +0100
+@@ -17,6 +17,7 @@
+ 		    --nssincdir=/usr/include/nss \
+ 		    --nsprincdir=/usr/include/nspr \
+ 		    --libexecdir=/usr/lib \
++		    --confdir=/cluster/config \
+ 		    --disable_kernel_check \
+ 		    --without_kernel_modules
+ 

Added: redhat-cluster/trunk/debian/patches/disable-xvm-fence.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/disable-xvm-fence.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/disable-xvm-fence.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,12 @@
+Index: cluster-3.0.7/configure
+===================================================================
+--- cluster-3.0.7.orig/configure	2010-02-12 07:15:10.000000000 +0100
++++ cluster-3.0.7/configure	2010-02-12 07:25:13.000000000 +0100
+@@ -683,6 +683,7 @@
+     chomp;
+     s|fence\/agents\/| |g;
+     s|lib ||g;
++    s|xvm ||g;
+     s|nss_wrapper ||g;
+     $all_fence = $_;
+   }

Added: redhat-cluster/trunk/debian/patches/enable-gfs.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/enable-gfs.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/enable-gfs.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,12 @@
+Index: cluster-3.0.7/debian/rules
+===================================================================
+--- cluster-3.0.7.orig/debian/rules	2010-02-12 07:42:03.000000000 +0100
++++ cluster-3.0.7/debian/rules	2010-02-12 07:42:48.000000000 +0100
+@@ -18,6 +18,7 @@
+ 		    --nsprincdir=/usr/include/nspr \
+ 		    --libexecdir=/usr/lib \
+ 		    --disable_kernel_check \
++		    --enable_gfs \
+ 		    --without_kernel_modules
+ 
+ 	touch $@

Added: redhat-cluster/trunk/debian/patches/fix-cman-init.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/fix-cman-init.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/fix-cman-init.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,27 @@
+
+ * check if cman_tool is installed
+
+ * do not overwrite global return status 'rtrn' - use local keyword
+
+Index: new/cman/init.d/cman.in
+===================================================================
+--- new.orig/cman/init.d/cman.in	2010-12-02 07:19:35.000000000 +0100
++++ new/cman/init.d/cman.in	2010-12-23 11:32:12.000000000 +0100
+@@ -19,6 +19,8 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+ 
++test -x @SBINDIR@/cman_tool || exit 0
++
+ chkconfig2()
+ {
+ 	case "$1" in
+@@ -46,7 +48,7 @@
+ status()
+ {
+ 	pid=$(pidof $1 2>/dev/null)
+-	rtrn=$?
++	local rtrn=$?
+ 	if [ $rtrn -ne 0 ]; then
+ 		echo "$1 is stopped"
+ 	else

Added: redhat-cluster/trunk/debian/patches/fix-lsb-header.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/fix-lsb-header.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/fix-lsb-header.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,100 @@
+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
+@@ -8,10 +8,10 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides:		cman
+-# Required-Start:	$network $time
+-# Required-Stop:	$network $time
+-# Default-Start:
+-# Default-Stop:
++# Required-Start:	pve-cluster
++# Required-Stop:	pve-cluster
++# Default-Start:        S
++# Default-Stop:         0 6
+ # Short-Description:	Starts and stops cman
+ # Description:		Starts and stops the Cluster Manager set of daemons
+ ### END INIT INFO
+@@ -19,7 +19,10 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+ 
++CCFG="/etc/cluster/cluster.conf"
++
+ test -x @SBINDIR@/cman_tool || exit 0
++test -f "$CCFG" || exit 0
+ 
+ chkconfig2()
+ {
+@@ -68,8 +71,7 @@
+ 
+ # deb based distros
+ if [ ! -d /etc/sysconfig ]; then
+-	[ -f /etc/default/cluster ] && . /etc/default/cluster
+-	[ -f /etc/default/cman ] && . /etc/default/cman
++	[ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
+ 	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cman"
+ 	netmanager=network-manager
+ fi
+Index: new/rgmanager/init.d/rgmanager.in
+===================================================================
+--- new.orig/rgmanager/init.d/rgmanager.in	2010-12-02 07:19:35.000000000 +0100
++++ new/rgmanager/init.d/rgmanager.in	2010-12-02 07:35:14.000000000 +0100
+@@ -8,8 +8,8 @@
+ # Provides:		rgmanager
+ # Required-Start:	cman
+ # Required-Stop:	cman
+-# Default-Start:
+-# Default-Stop:
++# Default-Start:        S
++# Default-Stop:         0 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
+@@ -20,6 +20,10 @@
+ # set secure PATH
+ PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"
+ 
++CCFG="/etc/cluster/cluster.conf"
++
++test -f "$CCFG" || exit 0
++
+ success()
+ {
+ 	echo -ne "[  OK  ]\r"
+@@ -52,8 +56,7 @@
+ 
+ # deb based distros
+ if [ -d /etc/default ]; then
+-	[ -f /etc/default/cluster ] && . /etc/default/cluster
+-	[ -f /etc/default/rgmanager ] && . /etc/default/rgmanager
++	[ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve
+ 	[ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/rgmanager"
+ fi
+ 
+@@ -72,6 +75,11 @@
+ 	done
+ }
+ 
++rgmanager_enabled()
++{
++	ccs_tool query /cluster/rm >/dev/null 2>&1
++}
++
+ rtrn=0
+ 
+ if [ "$EUID" != "0" ]; then
+@@ -81,6 +89,11 @@
+ 
+ case "$1" in
+ start)
++
++	if ! rgmanager_enabled; then
++	    exit 0;
++	fi
++
+ 	echo -n "Starting $ID: "
+ 
+ 	# most recent distributions use tmpfs for /var/run

Added: redhat-cluster/trunk/debian/patches/fix-startup-config-timeout.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/fix-startup-config-timeout.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/fix-startup-config-timeout.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,10 @@
+Index: new/cman/daemon/cman.h
+===================================================================
+--- new.orig/cman/daemon/cman.h	2010-11-10 11:54:07.000000000 +0100
++++ new/cman/daemon/cman.h	2010-11-10 11:54:36.000000000 +0100
+@@ -16,4 +16,4 @@
+ #define DEFAULT_SHUTDOWN_TIMEOUT 5000
+ #define DEFAULT_CCSD_POLL        1000
+ #define DEFAULT_DISALLOWED       0
+-#define DEFAULT_STARTUP_CONFIG_TIMEOUT 0
++#define DEFAULT_STARTUP_CONFIG_TIMEOUT 20

Added: redhat-cluster/trunk/debian/patches/remove-udev-break.diff
===================================================================
--- redhat-cluster/trunk/debian/patches/remove-udev-break.diff	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/remove-udev-break.diff	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,12 @@
+Index: cluster-3.0.6/debian/control
+===================================================================
+--- cluster-3.0.6.orig/debian/control	2010-02-03 14:41:34.000000000 +0100
++++ cluster-3.0.6/debian/control	2010-02-03 14:41:39.000000000 +0100
+@@ -148,7 +148,6 @@
+ Section: libs
+ Architecture: any
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+-Breaks: udev (<< 0.136-1)
+ Description: Red Hat cluster suite - distributed lock manager library
+  This package is part of the Red Hat Cluster Suite, a complete
+  high-availability solution.

Added: redhat-cluster/trunk/debian/patches/series
===================================================================
--- redhat-cluster/trunk/debian/patches/series	                        (rev 0)
+++ redhat-cluster/trunk/debian/patches/series	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,7 @@
+#disable-xvm-fence.diff
+#remove-udev-break.diff
+#change-confdir.diff
+#enable-gfs.diff
+fix-cman-init.diff
+fix-lsb-header.diff
+fix-startup-config-timeout.diff

Added: redhat-cluster/trunk/debian/redhat-cluster-pve-dev.install
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve-dev.install	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve-dev.install	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,4 @@
+usr/include/
+usr/lib/*.a
+usr/lib/pkgconfig
+usr/share/man/man3

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.default
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.default	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.default	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,7 @@
+# CLUSTERNAME=""
+# NODENAME=""
+# USE_CCS="yes"
+# CLUSTER_JOIN_TIMEOUT=300
+# CLUSTER_JOIN_OPTIONS=""
+# CLUSTER_SHUTDOWN_TIMEOUT=60
+# RGMGR_OPTIONS=""

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.dirs
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.dirs	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.dirs	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,3 @@
+var/log/cluster
+var/run/cluster
+etc/cluster
\ No newline at end of file

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.docs
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.docs	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.docs	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,4 @@
+doc/COPYING.applications
+doc/COPYING.libraries
+doc/usage.txt
+rgmanager/errors.txt

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.examples
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.examples	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.examples	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1 @@
+doc/cman_notify_template.sh
\ No newline at end of file

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.install
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.install	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.install	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,12 @@
+usr/sbin/*
+usr/lib/lcrso/*.lcrso usr/lib/lcrso/
+usr/lib/*.so.*
+usr/lib/*.so
+usr/share/cluster/*
+usr/share/man/man5/*
+usr/share/man/man8/*
+etc/init.d/cman
+etc/init.d/rgmanager
+etc/logrotate.d/cluster
+lib/udev/rules.d/45-dlm.rules
+usr/lib/perl5

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.postinst
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.postinst	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.postinst	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for cluster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+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 $?
+fi
+if [ -x "/etc/init.d/rgmanager" ]; then
+        update-rc.d rgmanager start 65 S . start 1 0 6 . >/dev/null || exit $?
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: redhat-cluster/trunk/debian/redhat-cluster-pve.postrm
===================================================================
--- redhat-cluster/trunk/debian/redhat-cluster-pve.postrm	                        (rev 0)
+++ redhat-cluster/trunk/debian/redhat-cluster-pve.postrm	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,43 @@
+#!/bin/sh
+# postrm script for cluster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+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 $?
+    ;;
+
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: redhat-cluster/trunk/debian/rules
===================================================================
--- redhat-cluster/trunk/debian/rules	                        (rev 0)
+++ redhat-cluster/trunk/debian/rules	2011-01-13 05:24:45 UTC (rev 5370)
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+BUILDROOT := $(shell pwd)
+
+%:
+	dh --with quilt  $@
+
+override_dh_auto_configure:
+	./configure --prefix=/usr \
+		    --libexecdir=/usr/lib \
+		    --disable_kernel_check
+
+
+override_dh_auto_install:
+	$(MAKE) install DESTDIR=$(BUILDROOT)/debian/tmp/
+
+	# we do not install upstream doc
+	rm -rf debian/tmp/usr/share/doc/cluster
+
+	# move udev rules to correct location
+	install -d -m 0755 debian/tmp/lib/udev/rules.d
+	mv debian/tmp/etc/udev/rules.d/51-dlm.rules debian/tmp/lib/udev/rules.d/45-dlm.rules
+	rmdir debian/tmp/etc/udev/rules.d
+
+	dh_install --list-missing
+
+override_dh_shlibdeps:
+	dh_shlibdeps -a -- debian/tmp/usr/lib/lcrso/*.lcrso


Property changes on: redhat-cluster/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + 



More information about the pve-devel mailing list