[kernel] r9977 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Wed Dec 19 12:18:57 2007
New Revision: 9977

Log:
Add handling for missing cluster.conf
Enable XEN support on amd64



Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/rules

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO	Wed Dec 19 12:18:57 2007
@@ -1,6 +1,5 @@
 Open packaging issues
 --------------------
-- add handling for missing cluster.conf (#420229, #381434, #367370)
 - add gnbd-source package containing the gnbd kernel module (#401073, #426769)
 - make initscripts lsb-compliant
 - redo description of gfs-source? (#380002)

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	Wed Dec 19 12:18:57 2007
@@ -11,7 +11,7 @@
   * Add gfs-source package containing the gfs1 kernel module
   * Provide module-assistant support in the gfs-source package.
     Closes: #366498, #412412
-  * fix gnbd-* packages description. Closes: #319204 
+  * Fix gnbd-* packages description. Closes: #319204
   * Lots of bugs fixed:
     - Fix initscripts. Closes: #367171, #336260, #336259
     - Provide manpages for cluster.conf, mkfs.gfs and fsck.gfs.
@@ -19,5 +19,7 @@
     - Provide rgmanager package. Closes: #400204
     - Rgmanager: add dependency on iputils-arping. Closes: #417813
     - Call dh_strip during install. Closes: #437899
-    
- -- Frederik Schüler <fs at debian.org>  Tue, 11 Dec 2007 02:34:52 +0100
+  * Add handling for missing cluster.conf. Closes: #420229, #381434, #367370
+  * Enable XEN support on amd64 too.
+
+ -- Frederik Schüler <fs at debian.org>  Wed, 19 Dec 2007 13:17:28 +0100

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.init	Wed Dec 19 12:18:57 2007
@@ -16,6 +16,8 @@
 CMAN_QUORUM_TIMEOUT=0
 CMAN_SHUTDOWN_TIMEOUT=60
 
+CONF=/etc/cluster/cluster.conf
+
 set -e
 
 load_modules() {
@@ -36,8 +38,23 @@
 	fi
 }
 
+check_cluster_conf() {
+
+	if [ ! -e $CONF -o ! -s $CONF ] ; then
+		echo ""
+		echo "$CONF does not exist or is empty."
+		echo "See /usr/share/doc/gfs-tools/examples/min-gfs.txt"
+		echo "for instructions on how to setup a minimal cluster."
+		echo "$DESC will not be started."
+		exit 0
+	fi
+
+}
+
 case "$1" in
   start)
+	check_cluster_conf
+
 	echo "Starting $DESC:"
 	echo -n " Loading kernel modules:"
 	load_modules

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	Wed Dec 19 12:18:57 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.7.3.0
-Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.82-2), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.22-6), libvirt-dev (>= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev [i386], bzip2
+Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.82-2), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.22-6), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2
 Build-Conflicts: libccs-dev, libcman-dev (<= 2.0), libdlm-dev (<= 2.0), libcman2, libdlm2
 
 Package: redhat-cluster-suite

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules	Wed Dec 19 12:18:57 2007
@@ -7,11 +7,11 @@
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), i386))
+xen_arches = amd64 i386
+ifneq (,$(filter $(DEB_HOST_ARCH), $(xen_arches))) 
   BUILD_XEN = --enable_xen
 endif
 
-
 BUILDROOT := $(shell pwd)
 
 SOMAJOR=2