Ebuild cleanup, fixed bug #139991, added gentoo init script (thanks to Ramon <ramon@vanalteren.nl>).

Package-Manager: portage-2203-svn

7 files changed, 140 insertions, 16 deletions

diff --git a/sys-cluster/rgmanager/ChangeLog b/sys-cluster/rgmanager/ChangeLog
index 1e65e6f54d5d..736ac348b75e 100644
--- a/sys-cluster/rgmanager/ChangeLog
+++ b/sys-cluster/rgmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/rgmanager
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.2 2005/06/30 23:24:49 xmerlin Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.3 2006/07/13 09:25:23 xmerlin Exp $
+
+*rgmanager-1.02.00 (13 Jul 2006)
+
+  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> +files/rgmanager.conf,
+  +files/rgmanager.rc, -rgmanager-1.00.00.ebuild, +rgmanager-1.02.00.ebuild:
+  Ebuild cleanup, fixed bug #139991, added gentoo init script (thanks to Ramon
+  <ramon@vanalteren.nl>).
 
 *rgmanager-1.00.00 (01 Jul 2005)
 
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
index 6ee792bb1205..320176698ab9 100644
--- a/sys-cluster/rgmanager/Manifest
+++ b/sys-cluster/rgmanager/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 36c6114315066b8cc40799053cf1fe58 ChangeLog 923
+MD5 9b7b430d3bc3f98b77ffdfd13778bd1c files/digest-rgmanager-1.02.00 68
+MD5 244912b1fd8bb3844c95670cdb535147 files/rgmanager.conf 240
+MD5 31fd588ad77dafbda85335e16e72806d files/rgmanager.rc 1983
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
-MD5 e2b655b34523f8231f91c9df46ba4568 ChangeLog 629
-MD5 cd7e932bd3e7b7e8f560a2a5ad6e03b6 rgmanager-1.00.00.ebuild 823
-MD5 4f2d164091c3df995eb6cd31f2347a68 files/digest-rgmanager-1.00.00 68
+MD5 481127b620396e0032813a2b9d5ba1ba rgmanager-1.02.00.ebuild 918
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFCxH94gMUyd/cdjWsRAt9QAJ4jKIJ7gFpz2iEtXew0JQnv6AAChwCdFUVE
-KsDK5Ic/HJTyAW6jeysD7Ak=
-=zNfM
+iD8DBQFEtiD5gMUyd/cdjWsRApDWAJ49blrh9VVB4Vv3mesT0M16iajADQCeP76f
+YL9s6nJMUiCSxeShH5094GQ=
+=sfUr
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/rgmanager/files/digest-rgmanager-1.00.00 b/sys-cluster/rgmanager/files/digest-rgmanager-1.00.00
deleted file mode 100644
index 7b0e114fb607..000000000000
--- a/sys-cluster/rgmanager/files/digest-rgmanager-1.00.00
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49548be2d01d007e8e74d801a8a98f37 cluster-1.00.00.tar.gz 1329114
diff --git a/sys-cluster/rgmanager/files/digest-rgmanager-1.02.00 b/sys-cluster/rgmanager/files/digest-rgmanager-1.02.00
new file mode 100644
index 000000000000..d6d5c9ac1fde
--- /dev/null
+++ b/sys-cluster/rgmanager/files/digest-rgmanager-1.02.00
@@ -0,0 +1 @@
+MD5 131c34c8b66d8d7d74384839ed4091d0 cluster-1.02.00.tar.gz 1356451
diff --git a/sys-cluster/rgmanager/files/rgmanager.conf b/sys-cluster/rgmanager/files/rgmanager.conf
new file mode 100644
index 000000000000..86c28d4d44d0
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.conf
@@ -0,0 +1,5 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager.conf,v 1.1 2006/07/13 09:25:23 xmerlin Exp $
+
+RGMGR_OPTS=""
diff --git a/sys-cluster/rgmanager/files/rgmanager.rc b/sys-cluster/rgmanager/files/rgmanager.rc
new file mode 100755
index 000000000000..e206bb4ce399
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager.rc
@@ -0,0 +1,107 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Adaption of the original RedHat script
+# Original Copyright (C) 2003 Red Hat, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/files/rgmanager.rc,v 1.1 2006/07/13 09:25:23 xmerlin Exp $
+
+depend() {
+	use net
+	need ccs cluster-manager cluster-locking-manager
+}
+
+# We'd like a reload method as well
+opts="${opts} reload"
+
+ID="Cluster Resource Manager"
+RGMGRD=$(which clurgmgrd)
+RMTABD=$(which clurmtabd)
+CFG_FILE="/etc/cluster/cluster.conf"
+
+LOG_ERR=3
+LOG_WARNING=4
+LOG_NOTICE=5
+LOG_INFO=6
+
+#
+# If we're not configured, then don't start anything.
+#
+[ -f "$CFG_FILE" ] || exit 0
+
+
+#
+# log_and_print <level> <message>
+#
+function log_and_print()
+{
+	if [ -z "$1" -o -z "$2" ]; then
+		return 1;
+	fi
+
+	clulog -p $$ -n "rgmanager" -s $1 "$2"
+	echo $2
+
+	return 0;
+}
+
+
+#
+# Bring down the cluster on a node.
+#
+function stop_cluster()
+{
+	kill -TERM $(pidof $RGMGRD)
+
+	while [ 0 ]; do
+		if [ -n "`pidof $RGMGRD`" ]; then
+			while [ -n "`pidof $RGMGRD`" ]; do
+				sleep 1
+			done
+			einfo "Waiting for $(basename ${RGMGRD})"
+		else
+			eend "Services are stopped."
+		fi
+
+		# Ensure all NFS rmtab daemons are dead.
+		killall $(basename ${RMTABD}) &> /dev/null
+		
+		rm -f /var/run/$(basename ${RGMGRD}).pid
+
+		return 0
+	done
+}
+
+
+
+function start() {
+	ebegin "Starting cluster resource manager"
+	start-stop-daemon --start --quiet --exec ${RGMGRD} ${RGMGR_OPTS}
+	touch /var/lock/subsys/rgmanager
+	eend 
+}
+
+function restart() {
+	pidof ${RGMGRD} &> /dev/null
+	if [ ${?} -ne 1 ]; then
+		svc_stop
+	fi
+	svc_start
+}
+
+function reload() {
+	clulog -p ${LOG_NOTICE} "Reloading Resource Configuration."
+	ebegin "Reloading Resource Configuration "
+	kill -s HUP $(pidof ${RGMGRD} )
+	rv=${?}
+	eend
+	exit ${rv}
+}
+
+function stop() {
+	ebegin "Shutting down cluster resource manager"
+	if [ -n "$(pidof ${RGMGRD})" ]; then
+		stop_cluster
+	fi
+	rm -f /var/lock/subsys/rgmanager
+	eend
+}
diff --git a/sys-cluster/rgmanager/rgmanager-1.00.00.ebuild b/sys-cluster/rgmanager/rgmanager-1.02.00.ebuild
index cf2fab1fefa0..fec8b9ea202a 100644
--- a/sys-cluster/rgmanager/rgmanager-1.00.00.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-1.02.00.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-1.00.00.ebuild,v 1.1 2005/06/30 23:24:49 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-1.02.00.ebuild,v 1.1 2006/07/13 09:25:23 xmerlin Exp $
 
 inherit linux-mod
 
-CLUSTER_VERSION="1.00.00"
+CLUSTER_VERSION="1.02.00"
 DESCRIPTION="Clustered resource group manager layered on top of Magma"
 HOMEPAGE="http://sources.redhat.com/cluster/"
 SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/cluster-${CLUSTER_VERSION}.tar.gz"
@@ -12,10 +12,10 @@ IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="~x86 ~amd64"
 
-DEPEND=">=sys-cluster/magma-1.00.00
-	>=sys-cluster/magma-plugins-1.00.00
+DEPEND=">=sys-cluster/magma-1.02.00
+	>=sys-cluster/magma-plugins-1.02.00
 	dev-libs/libxml2
 	"
 
@@ -30,4 +30,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
+
+	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	newconfd ${FILESDIR}/${PN}.conf ${PN} || die
 }