[gentoo-commits] proj/sci:master commit in: sys-cluster/open-mx/files/, sys-cluster/open-mx/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     a50a45a832fe1cc18fb8da5e50bc46c8e7525498
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 23:31:01 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 23:31:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a50a45a8

[sys-cluster/open-mx] Update init.d

(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 sys-cluster/open-mx/files/omxoed.initd   |   25 ++++++++++++++++++++++++-
 sys-cluster/open-mx/open-mx-1.4.0.ebuild |    2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/open-mx/files/omxoed.initd b/sys-cluster/open-mx/files/omxoed.initd
index b6c461d..f30a4a5 100644
--- a/sys-cluster/open-mx/files/omxoed.initd
+++ b/sys-cluster/open-mx/files/omxoed.initd
@@ -7,8 +7,26 @@ depend() {
 	need net
 }
 
-start() { 
+checksystem() {
+	if [ -c /dev/open-mx ]; then
+		einfo "Open-MX module already loaded"
+		return 0
+	else
+		einfo "Checking if Open-MX module present"
+		if [ "x$(modprobe -l  open-mx | grep open-mx)" == "x" ]; then
+			eerror "open-mx not found!"
+			return 1
+		fi
+	fi
+}
+
+start() {
 	ebegin "Starting ${SVCNAME}"
+	checksystem || return 1
+	if [ ! -c /dev/open-mx]; then
+		ebegin "Loading open-mx module"
+		modprobe -q open-mx
+	fi
 	start-stop-daemon --start --exec /usr/bin/omxoed \
 	 	--background --make-pidfile \
 	 	--pidfile /var/run/omeoed.pid
@@ -21,3 +39,8 @@ stop() {
 		--pidfile /var/run/omeoed.pid
 	eend $?
 }
+
+status() {
+	ebegin "Showing current active Open-MX peers"
+	omx_info -q
+}

diff --git a/sys-cluster/open-mx/open-mx-1.4.0.ebuild b/sys-cluster/open-mx/open-mx-1.4.0.ebuild
index 8f2baea..669e7bd 100644
--- a/sys-cluster/open-mx/open-mx-1.4.0.ebuild
+++ b/sys-cluster/open-mx/open-mx-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/28399/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug modules static-libs"
 
 DEPEND="