sys-cluster/globus: updated globus init.d script

svn path=/sunrise/; revision=9018

4 files changed, 64 insertions, 19 deletions

diff --git a/sys-cluster/globus/ChangeLog b/sys-cluster/globus/ChangeLog
index 6e0a88e6a..9aa21b5ad 100644
--- a/sys-cluster/globus/ChangeLog
+++ b/sys-cluster/globus/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Aug 2009; John (EBo) David <ebo@users.sourceforge.net> files/22globus,
+  files/globus-init.d:
+  updated globus init.d script
+
+  15 Aug 2009; John (EBo) David <ebo@users.sourceforge.net> files/22globus,
+  files/globus-init.d:
+  updated globus init.d script
+
   15 Aug 2009; John (EBo) David <ebo@users.sourceforge.net> +files/22globus,
   +globus-4.2.1.ebuild, +files/gaa_test.patch, +files/globus-init.d,
   +files/gwd_open.patch, +metadata.xml:
diff --git a/sys-cluster/globus/Manifest b/sys-cluster/globus/Manifest
index 3d07abb70..41beb4dac 100644
--- a/sys-cluster/globus/Manifest
+++ b/sys-cluster/globus/Manifest
@@ -1,8 +1,8 @@
-AUX 22globus 187 RMD160 2c9f1bd0051f19721a9fc43024cbbd920c8bc965 SHA1 55f53f00e674631402ed7cb90813de585360aa26 SHA256 21b2c26cc49ea4808918b1f6bb253e251ed6a228b6fab93996835ff9eadda741
+AUX 22globus 214 RMD160 769ea0390421d4b5553deefd46346853d8c2478b SHA1 4e95c76b3c2486039d03029a2442bac3fb37ea74 SHA256 36137e1893bc564740e0b4040784ca1ee1607d53bbd3cb65430b7d3b761149be
 AUX gaa_test.patch 596 RMD160 a35a8600e546e78b0abd19feab2d918c83124eb9 SHA1 3e6e57a4a0557e01d0423ed83a423d5b04bc7771 SHA256 d781a97e961c821e4059e9a548d2ec18a7d51d1239e12f10e446bb00126b2e9f
-AUX globus-init.d 867 RMD160 dd063be48c78a263622c419af830a5c1a9f89d3a SHA1 4e468a64293e594adb33d51a8eee450bde98ad0d SHA256 78ec22c11cf93bbf3e12810d6e5524cb6389578ad6959fbb284e7b8e155e5285
+AUX globus-init.d 1566 RMD160 53c449256203f44238c0561bfa9e09e2392cfc98 SHA1 bab5245e5942753611c2d80107e2219a787c3849 SHA256 e4d216ffcb511b31935cee3076c2b0e7045da924e19074257302a2cd1dbd837e
 AUX gwd_open.patch 470 RMD160 a561456c15e6e6b01cd6d1291da0e76dcf3bca32 SHA1 c846e281e0251490c4f0b0fb7e4d8b4c901d6277 SHA256 95e66415b01f6971379c07447d7a25875f7f9261381f26730323d92fd465b2a3
 DIST gt4.2.1-all-source-installer.tar.bz2 111057292 RMD160 a8ffb66c47c0221acdf17256e1495e613417226e SHA1 33c6868189a6652a8714abe9ad8fa2cc481dd1d7 SHA256 f22deb1d47556e9c4be8ed556f497e6cded641c41f103663d7f499f9175d3705
 EBUILD globus-4.2.1.ebuild 6430 RMD160 1ac94d257667a18fd9313ae45298355a9a8fe490 SHA1 77257a94f9cc560ed8d8f406a1febf8820bc29d6 SHA256 c94cd3284dbf80074c37a66288976d55c913fbf20f3bca4d664049aaad1f8d4b
-MISC ChangeLog 671 RMD160 004f85c8f6561743502c8db6830539056685f724 SHA1 263b82a8b8c419afbae4ebcadb56dcc61ad2744a SHA256 1e0843f6df328013d1ab15700384f8a941dfa2fc85f01a9e24265355fe86c4b6
+MISC ChangeLog 933 RMD160 b4ebf5ab0188a54348bdcc6384a10ab1ee7d193d SHA1 3fe127815648581296189514a306b32afc264723 SHA256 c83ce82f90aa8e107dbb4d02a8ac15e8e5e3ea8bcda9cecfe31417051bad2147
 MISC metadata.xml 1434 RMD160 b96dc3a576183b200dd56cad0c58b8c11a724cf5 SHA1 22235a184117d466f81f0625fd079c6326d06795 SHA256 5d7ef0796e86277177b6886b487bf3f5c9dccaf2ecb45f85871e5797f24d57d7
diff --git a/sys-cluster/globus/files/22globus b/sys-cluster/globus/files/22globus
index 4b9e1bf1f..4022938bf 100644
--- a/sys-cluster/globus/files/22globus
+++ b/sys-cluster/globus/files/22globus
@@ -1,3 +1,4 @@
+GLOBUS_LOCATION=%%GLOBUS%%
 GPT_LOCATION=%%GLOBUS%%
 PATH=%%GLOBUS%%/sbin:%%GLOBUS%%/bin
 LDPATH=%%GLOBUS%%/lib
diff --git a/sys-cluster/globus/files/globus-init.d b/sys-cluster/globus/files/globus-init.d
index bc97d3e9f..ba04153c5 100644
--- a/sys-cluster/globus/files/globus-init.d
+++ b/sys-cluster/globus/files/globus-init.d
@@ -3,28 +3,64 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-source ${GLOBUS_LOCATION}/etc/globus-user-env.sh
+GLOBUS_LOCATION=/opt/globus4
+
+source "${GLOBUS_LOCATION}"/etc/globus-user-env.sh
 
 depend() {
-    need net
+	after localmount netmount nfsmount dns
+	need net
 }
 
+PIDFILE="/var/run/globus.pid"
+
+checkconfig() {
+# FIXME: find an appropriate file -- like the certificates or something
+#	if [ ! -e /etc/SOME_FILE... ] ; then
+#		eerror "You need an SOME_FILE file to run globus"
+#		return 1
+#	fi
+
+	# verify presence of server binary
+	if ! [ -x "${GLOBUS_LOCATION}/bin/globus-start-container" ]; then
+		eerror "Could not find executable ${GLOBUS_LOCATION}/bin/globus-start-container"
+		return 1
+	fi
+}
+
+
 start() {
-    ebegin "Starting Globus WS Container"
-    ${GLOBUS_LOCATION}/bin/globus-start-container ${CONTAINER_OPTS} >
-${LOG_FILE} 2>&1 &
-    eend ${?}
+	checkconfig || return 1
+
+	ebegin "Starting Globus WS Container"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" \
+		--exec "${GLOBUS_LOCATION}"/bin/globus-start-container -- \
+			${CONTAINER_OPTS}
+
+#		--stdout "${LOG_FILE}" \
+
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping Globus WS Container"
-        ${GLOBUS_LOCATION}/bin/grid-proxy-init \
-                        -cert /etc/grid-security/containercert.pem \
-                        -key /etc/grid-security/containerkey.pem \
-                        -out /tmp/containerproxy.pem  > /dev/null
-        export X509_USER_PROXY=/tmp/containerproxy.pem
-        ${GLOBUS_LOCATION}/bin/globus-stop-container
-        export  X509_USER_PROXY
-        rm /tmp/containerproxy.pem
-    eend ${?}
+	ebegin "Stopping Globus WS Container"
+
+	local container ret
+	container="$(mktemp -d)"
+
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" \
+		--stdout "${LOG_FILE}" \
+		--exec "${GLOBUS_LOCATION}"/bin/grid-proxy-init -- \
+						-cert /etc/grid-security/containercert.pem \
+						-key  /etc/grid-security/containerkey.pem \
+						-out  "${container}"/containerproxy.pem 
+
+	X509_USER_PROXY=${container}/containerproxy.pem \
+		"${GLOBUS_LOCATION}"/bin/globus-stop-container
+
+	ret = $? # cache globus-stop-container's return code.
+
+	rm -rf "${container}"
+    
+	eend ${ret}
 }