5 files changed, 11 insertions, 42 deletions
diff --git a/sys-cluster/fence/ChangeLog b/sys-cluster/fence/ChangeLog
index f837858af998..d90d2f6f9a79 100644
--- a/sys-cluster/fence/ChangeLog
+++ b/sys-cluster/fence/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/fence
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.11 2005/03/25 02:15:31 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/ChangeLog,v 1.12 2005/03/25 16:06:31 xmerlin Exp $
+
+  25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/fenced.rc,
+  fence-1.25.ebuild, -fence-1.5.ebuild:
+  ebuild cleaned up, some cosmetic improvements on the init script
 
   25 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> files/fenced.rc:
   improved init script
diff --git a/sys-cluster/fence/fence-1.25.ebuild b/sys-cluster/fence/fence-1.25.ebuild
index 2cad90cc8875..4e327bde085f 100644
--- a/sys-cluster/fence/fence-1.25.ebuild
+++ b/sys-cluster/fence/fence-1.25.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.25.ebuild,v 1.4 2005/03/23 02:41:47 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.25.ebuild,v 1.5 2005/03/25 16:06:31 xmerlin Exp $
 
 DESCRIPTION="I/O fencing system"
 HOMEPAGE="http://sources.redhat.com/cluster/"
-#SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${P}.tar.gz"
 
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	http://dev.gentoo.org/~xmerlin/gfs/${P}.tar.gz"
@@ -26,6 +25,6 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/fenced.rc fenced || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/fenced.conf fenced || die
+	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	newconfd ${FILESDIR}/${PN}.conf ${PN} || die
 }
diff --git a/sys-cluster/fence/fence-1.5.ebuild b/sys-cluster/fence/fence-1.5.ebuild
deleted file mode 100644
index df10699b57aa..000000000000
--- a/sys-cluster/fence/fence-1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/fence-1.5.ebuild,v 1.1 2005/03/19 15:30:00 xmerlin Exp $
-
-inherit linux-mod
-
-DESCRIPTION="I/O fencing system"
-HOMEPAGE="http://sources.redhat.com/cluster/"
-#SRC_URI="http://people.redhat.com/cfeist/cluster/tgz/${P}.tar.gz"
-
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/gfs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=sys-cluster/ccs-0.24
-	>=sys-cluster/cman-kernel-2.6.9"
-
-
-src_compile() {
-	check_KV
-	set_arch_to_kernel
-
-	./configure --kernel_src=${KERNEL_DIR} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/sys-cluster/fence/files/digest-fence-1.5 b/sys-cluster/fence/files/digest-fence-1.5
deleted file mode 100644
index ef0718b7eb82..000000000000
--- a/sys-cluster/fence/files/digest-fence-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b315592ae9137ceefc9422b2abe580bd fence-1.5.tar.gz 75948
diff --git a/sys-cluster/fence/files/fenced.rc b/sys-cluster/fence/files/fenced.rc
index 68c7b6abbe09..e6d03aa27637 100755
--- a/sys-cluster/fence/files/fenced.rc
+++ b/sys-cluster/fence/files/fenced.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/files/fenced.rc,v 1.4 2005/03/25 02:15:31 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/fence/files/fenced.rc,v 1.5 2005/03/25 16:06:31 xmerlin Exp $
 
 depend() {
 	use net
@@ -16,7 +16,7 @@ start() {
 
 umount_gfs_filesystems() {
 	local sig retry
-	local remaining="$(awk '$3 ~ /gfs/ { print $2 }' /proc/mounts | sort -r)"
+	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts)"
 
 	if [ -n "${remaining}" ]
 	then
@@ -34,7 +34,7 @@ umount_gfs_filesystems() {
 	                        umount ${remaining} &>/dev/null
 	                        eend $? "Failed to unmount GFS filesystems"
 	                fi
-	                remaining="$(awk '$3 ~ /gfs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+	                remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts)"
 	                [ -z "${remaining}" ] && break
 	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
 	                sleep 5