init script and install location fixes

5 files changed, 59 insertions, 31 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 913b44e176ec..0036ea99658d 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.4 2003/07/22 14:09:23 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.5 2003/09/24 06:35:52 iggy Exp $
+
+  24 Sep 2003; <iggy@gentoo.org> heartbeat-1.1.2.ebuild, files/heartbeat-init:
+  a bunch of fixups, it should actually work now, even though I didn't use any
+  of his suggestions a thanks is in order for Jan Krueger for bringing all this
+  to my attention
 
 *heartbeat-1.1.2 (22 Jul 2003)
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 16780c495986..e8f93bc0d8e5 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,7 +1,7 @@
-MD5 17bda87e72648bff482c04144ac9ed9d files/digest-heartbeat-1.0.3-r1 68
-MD5 771d80cc7931bc1b45cd6399ad4977b4 files/digest-heartbeat-1.1.2 68
-MD5 96dc7c83a5ffa89a727cf2a2f6c1213f files/heartbeat-init 885
-MD5 6fa727d955c63787ee0d0fd0498a1b6b ChangeLog 933
+MD5 c7e2ad7bf35fcbf866603a546cf697f5 heartbeat-1.0.3-r1.ebuild 1147
+MD5 a07886eb42eedcc69cd8d865b121bde5 ChangeLog 1190
 MD5 5161e76bc0f80fa0964d4234bbd1b6f0 metadata.xml 418
-MD5 64e683b7d0e13f82c3f12fc25857dc0f heartbeat-1.0.3-r1.ebuild 674
-MD5 f9d1aa498659bc9dbc3954247e060638 heartbeat-1.1.2.ebuild 672
+MD5 2edd12b44ef990f1966ef307bbd5eb3f heartbeat-1.1.2.ebuild 1145
+MD5 771d80cc7931bc1b45cd6399ad4977b4 files/digest-heartbeat-1.1.2 68
+MD5 c0c9a3b2eebb92b8a6af22d3bd26aea4 files/heartbeat-init 722
+MD5 17bda87e72648bff482c04144ac9ed9d files/digest-heartbeat-1.0.3-r1 68
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init
index 3eba095b245b..03289ad93e68 100644
--- a/sys-cluster/heartbeat/files/heartbeat-init
+++ b/sys-cluster/heartbeat/files/heartbeat-init
@@ -9,15 +9,6 @@ depend() {
 	need net
 }
 
-checkconfig() {
-	[ ! -f /etc/ha.d/ha.cf ] && \
-		eerror "You need a heartbeat config file" && return 1
-
-	if [  -f $HA_DIR/ipresources -a ! -f $HA_DIR/haresources ] ; then
-		cat $HA_DIR/ipresources >> $HA_DIR/haresources
-	fi
-}
-
 # Run pre-startup script if it exists
 RunStartStop() {
 
@@ -26,29 +17,29 @@ RunStartStop() {
 }
 
 start() {
-	checkconfig
 	ebegin "Starting Heartbeat"
 
 	RunStartStop pre-start
 
-	/usr/bin/heartbeat 2>&1
-	/usr/bin/ResourceManager verifyallidle
+	/usr/lib/heartbeat/heartbeat 2>&1
+	ret=$?
+	/usr/lib/heartbeat/ResourceManager verifyallidle
 
 	RunStartStop post-start
 
-	eend $?
+	eend ret
 }
 
 stop() {
 	ebegin "Stopping Heartbeat"
-	/usr/bin/heartbeat -k &> /dev/null
+	/usr/lib/heartbeat/heartbeat -k &> /dev/null
 	eend $?
 }
 
 restart() {
-	heartbeat -r
+	/usr/lib/heartbeat/heartbeat -r
 }
 
 status() {
-	heartbeat -s
+	/usr/lib/heartbeat/heartbeat -s
 }
diff --git a/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild
index 93ef292ed17d..1a5f5e434cbb 100644
--- a/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild,v 1.2 2003/08/21 05:07:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.0.3-r1.ebuild,v 1.3 2003/09/24 06:35:52 iggy Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -12,14 +12,30 @@ KEYWORDS="x86"
 
 DEPEND="dev-libs/popt
 	dev-libs/glib
-	net-libs/libnet
-	snmp? ( virtual/snmp )"
+	net-libs/libnet"
 
 src_compile() {
-	econf || die
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-group-name=cluster \
+		--with-group-id=65 \
+		--with-ccmuser-name=cluster \
+		--with-ccmuser-id=65 || die
 	emake || die
 }
 
+pkg_preinst() {
+	# check for cluster group, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/group ; then
+		groupadd -g 65 cluster
+	fi
+	# check for cluster user, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/passwd ; then
+		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
+	fi
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d
diff --git a/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild b/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild
index e61219459e14..2f9b56141bc6 100644
--- a/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild,v 1.2 2003/08/21 05:07:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.2.ebuild,v 1.3 2003/09/24 06:35:52 iggy Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -12,14 +12,30 @@ KEYWORDS="~x86"
 
 DEPEND="dev-libs/popt
 	dev-libs/glib
-	net-libs/libnet
-	snmp? ( virtual/snmp )"
+	net-libs/libnet"
 
 src_compile() {
-	econf || die
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-group-name=cluster \
+		--with-group-id=65 \
+		--with-ccmuser-name=cluster \
+		--with-ccmuser-id=65 || die
 	emake || die
 }
 
+pkg_preinst() {
+	# check for cluster group, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/group ; then
+		groupadd -g 65 cluster
+	fi
+	# check for cluster user, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/passwd ; then
+		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
+	fi
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d