fixed some deps, changed fence option, new init

(Portage version: 2.0.51.19)

4 files changed, 31 insertions, 47 deletions

diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog
index 65653d2b2e8b..b72d2101db09 100644
--- a/sys-fs/gfs/ChangeLog
+++ b/sys-fs/gfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/gfs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.1 2005/03/19 17:32:19 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.2 2005/03/19 22:04:36 xmerlin Exp $
+
+  19 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs,
+  gfs-6.1_pre21.ebuild:
+  new init
+
+  19 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/gfs,
+  gfs-6.1_pre21.ebuild:
+  fixed some deps, changed fence option
 
 *gfs-6.1_pre3 (19 Mar 2005)
 
diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest
index 7a8785471260..77ca224da9be 100644
--- a/sys-fs/gfs/Manifest
+++ b/sys-fs/gfs/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d3c09e42d7a70cd66a6114228b58da97 ChangeLog 523
-MD5 9aa78aee6bb4a2901a070ef20a2efc65 gfs-6.1_pre21.ebuild 1462
+MD5 1e961a8f26628f9405102fee11562d0c gfs-6.1_pre21.ebuild 1582
 MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
 MD5 8b61a396206c23d7fb8e1adad649f8b7 files/digest-gfs-6.1_pre21 65
 MD5 b0cc9eee00d3d6398a6b64aed9e586a5 files/gfs 1424
 MD5 b61c5aba640725d80ee0d9a1ca9998c8 files/gfs-mount 797
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCPGN3gMUyd/cdjWsRAqBCAJ4jhMIompOukqsE05qxVPwwe9hcawCeJvii
-Yp1ysSaGPYvr9N/T9NPXU7w=
-=XDD0
------END PGP SIGNATURE-----
diff --git a/sys-fs/gfs/files/gfs b/sys-fs/gfs/files/gfs
index 243171c26850..b06319b41bec 100755
--- a/sys-fs/gfs/files/gfs
+++ b/sys-fs/gfs/files/gfs
@@ -1,11 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs,v 1.1 2005/03/19 17:32:19 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs,v 1.2 2005/03/19 22:04:36 xmerlin Exp $
 
 depend() {
 	provide cluster
 	need net
+	need ccs fenced
+	after cman
 	use dns logger
 }
 
@@ -22,45 +24,22 @@ start() {
 	checkconfig || return $?
 
 	einfo "Starting gfs cluster:"
+        ebegin "Loading needed kernel modules"
 
-	ebegin "Loading needed kernel modules"
-
-	if [ ! -f /proc/cluster/lock_dlm ]; then
-		modprobe lock_dlm
-	fi
+        if [ ! -f /proc/cluster/lock_dlm ]; then
+                modprobe lock_dlm
+        fi
 	if [ ! -f /proc/fs/gfs ]; then
 		modprobe gfs
 	fi
 	eend $? "Failed to load needed kernel modules"
 
-	ebegin "Starting ccsd"
-	start-stop-daemon --start --quiet --pidfile /var/run/ccsd.pid \
-		--startas /sbin/ccsd
-	sleep 2
-	eend $? "Failed to start ccsd"
-
-	ebegin "Joining the cluster"
-	/sbin/cman_tool join
-	eend $? "Failed to join the cluster"
-
-	ebegin "Joining the fence domain (in 120 seconds)"
-	/sbin/fence_tool join -t 120
-	eend $? "Failed to join the fence domain"
 }
 
 stop() {
 	einfo "Stopping gfs cluster:"
-
-	ebegin "Leaving the fence domain"
-	/sbin/fence_tool leave
-	eend $? "Failed to leave the fence domain"
-
-	ebegin "Leaving the cluster"
-	sleep 2
-	/sbin/cman_tool leave
-	eend $? "Failed to leave the cluster"
-
-	ebegin "Stopping ccsd"
-	killall -9 ccsd
-	eend $? "Failed to stop ccsd"
+	ebegin "Removing gfs module"
+	modprobe -r gfs &>/dev/null
+	eend $?
+	
 }
diff --git a/sys-fs/gfs/gfs-6.1_pre21.ebuild b/sys-fs/gfs/gfs-6.1_pre21.ebuild
index d7fce1648fa4..f857e0dc61fa 100644
--- a/sys-fs/gfs/gfs-6.1_pre21.ebuild
+++ b/sys-fs/gfs/gfs-6.1_pre21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-6.1_pre21.ebuild,v 1.1 2005/03/19 17:32:19 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-6.1_pre21.ebuild,v 1.2 2005/03/19 22:04:36 xmerlin Exp $
 
 inherit linux-mod
 
@@ -21,9 +21,16 @@ IUSE=""
 
 DEPEND=">=sys-cluster/gfs-kernel-2.6.9-r1
 	>=sys-cluster/iddev-1.9
-	sys-fs/e2fsprogs"
+	sys-fs/e2fsprogs
+	"
 
-RDEPEND="sys-fs/e2fsprogs"
+RDEPEND="sys-fs/e2fsprogs
+	>=sys-cluster/ccs-0.24
+	>=sys-cluster/cman-1.0_pre3
+	>=sys-cluster/magma-1.0_pre21
+	>=sys-cluster/magma-plugins-1.0_pre18
+	>=sys-cluster/fence-1.25
+	"
 
 S="${WORKDIR}/${MY_P}"