diff options
author | Christian Zoffoli <xmerlin@gentoo.org> | 2006-07-13 12:52:23 +0000 |
---|---|---|
committer | Christian Zoffoli <xmerlin@gentoo.org> | 2006-07-13 12:52:23 +0000 |
commit | 70a7aeb0a545c6506179b7c25924f9e3410b746e (patch) | |
tree | 2d76c217f6670ab20bff66263aaea7d33c4261c1 /sys-cluster/heartbeat/files | |
parent | Mark 2.6.8-r2 stable on ia64 (diff) | |
download | gentoo-2-70a7aeb0a545c6506179b7c25924f9e3410b746e.tar.gz gentoo-2-70a7aeb0a545c6506179b7c25924f9e3410b746e.tar.bz2 gentoo-2-70a7aeb0a545c6506179b7c25924f9e3410b746e.zip |
Added GUI support, fixed bug #131514. Thanks to Neil Katin <gentoo@askneil.com>. Improved init script, fixed bug #133170. Thanks to Petre Rodan <kaiowas@gentoo.org>.
(Portage version: 2.1-r1)
Diffstat (limited to 'sys-cluster/heartbeat/files')
6 files changed, 67 insertions, 12 deletions
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 index 1db4b5d1aa0a..85ac88aebbda 100644 --- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 +++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 @@ -1 +1,3 @@ MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513 +RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513 +SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 index 1db4b5d1aa0a..85ac88aebbda 100644 --- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 +++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 @@ -1 +1,3 @@ MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513 +RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513 +SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 index 1db4b5d1aa0a..85ac88aebbda 100644 --- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 +++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 @@ -1 +1,3 @@ MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513 +RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513 +SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 index cc4914c94d4c..e8c91007a8bb 100644 --- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 +++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 @@ -1 +1,3 @@ MD5 659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz 2807110 +RMD160 94ff6d018253c29bee876bc5063ab1072b51091d heartbeat-2.0.4.tar.gz 2807110 +SHA256 334a3df02cdba3f1ef5f0ff60be54702928c54b40a5623cd55150b2a2d5d079f heartbeat-2.0.4.tar.gz 2807110 diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5 new file mode 100644 index 000000000000..b2eda3c2f3d9 --- /dev/null +++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5 @@ -0,0 +1,3 @@ +MD5 209228b2948cfa4762a3a66454c6cc35 heartbeat-2.0.5.tar.gz 2837784 +RMD160 38591600953fe225ba9c548fd63b328f7e344da3 heartbeat-2.0.5.tar.gz 2837784 +SHA256 55565e61d991dd6b902b6b842321b6f33dd24ab4025cbd8bc72ae8b18e68e2b9 heartbeat-2.0.5.tar.gz 2837784 diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init index f3befad12794..a3ae6192bb29 100644 --- a/sys-cluster/heartbeat/files/heartbeat-init +++ b/sys-cluster/heartbeat/files/heartbeat-init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.5 2004/07/15 00:54:33 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.6 2006/07/13 12:52:23 xmerlin Exp $ HA_DIR=/etc/ha.d @@ -10,35 +10,79 @@ depend() { need net } +opts="start stop status reload restart" + +CheckBool() { + case `echo "$1" | tr A-Z a-z` in + y|yes|enable|on|true|1) true;; + *) false;; + esac +} + # Run pre-startup script if it exists RunStartStop() { [ -f $HA_DIR/resource.d/startstop ] && $HA_DIR/resource.d/startstop "$@" } start() { - ebegin "Starting Heartbeat" + ebegin "Starting heartbeat" + + . $HA_DIR/shellfuncs + + # start the log subsystem + /usr/lib/heartbeat/ha_logd -s &>/dev/null && \ + /usr/lib/heartbeat/ha_logd -d RunStartStop pre-start - /usr/lib/heartbeat/heartbeat 2>&1 + CheckBool "`ha_parameter crm`" && \ + /usr/lib/heartbeat/ResourceManager verifyallidle + + /usr/lib/heartbeat/heartbeat &>/dev/null ret=$? - /usr/lib/heartbeat/ResourceManager verifyallidle RunStartStop post-start - eend $ret + eend ${ret} } stop() { - ebegin "Stopping Heartbeat" - /usr/lib/heartbeat/heartbeat -k &> /dev/null - eend $? -} + ebegin "Stopping heartbeat" -restart() { - /usr/lib/heartbeat/heartbeat -r + RunStartStop pre-stop + + /usr/lib/heartbeat/heartbeat -k &>/dev/null + ret=$? + + RunStartStop post-stop ${ret} + + # stop log subsystem + /usr/lib/heartbeat/ha_logd -s &>/dev/null || \ + /usr/lib/heartbeat/ha_logd -k &>/dev/null + + eend ${ret} } status() { /usr/lib/heartbeat/heartbeat -s } + +reload() { + ebegin "Reloading heartbeat" + /usr/lib/heartbeat/heartbeat -r &>/dev/null + eend $? +} + +restart() { + . $HA_DIR/shellfuncs + + sleeptime=$(( `ha_parameter deadtime` + 10 )) + + svc_stop + + ebegin " waiting ${sleeptime}s to allow resource takeover to complete" + sleep ${sleeptime} + eend 0 + + svc_start +} |