diff options
| author |   Christian Zoffoli <xmerlin@gentoo.org> | 2007-03-01 00:48:11 +0000 |
|---|---|---|
| committer | Christian Zoffoli <xmerlin@gentoo.org> | 2007-03-01 00:48:11 +0000 |
| commit | 8ebcf29458325bcb3e24555cff201db90326053a (patch) | |
| tree | 6154e7844383e101060ee3f89671f13eaf0ec856 /sys-cluster/heartbeat/files | |
| parent | Stable on SPARC wrt bug #166309. (diff) | |
| download | gentoo-2-8ebcf29458325bcb3e24555cff201db90326053a.tar.gz gentoo-2-8ebcf29458325bcb3e24555cff201db90326053a.tar.bz2 gentoo-2-8ebcf29458325bcb3e24555cff201db90326053a.zip | |
Merged some fixes.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'sys-cluster/heartbeat/files')
| -rw-r--r-- | sys-cluster/heartbeat/files/heartbeat-init | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init index a3ae6192bb29..5a81a21ce818 100644 --- a/sys-cluster/heartbeat/files/heartbeat-init +++ b/sys-cluster/heartbeat/files/heartbeat-init @@ -1,9 +1,10 @@ #!/sbin/runscript # 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.6 2006/07/13 12:52:23 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.7 2007/03/01 00:48:11 xmerlin Exp $ HA_DIR=/etc/ha.d +. $HA_DIR/shellfuncs depend() { use logger @@ -30,12 +31,13 @@ start() { . $HA_DIR/shellfuncs # start the log subsystem - /usr/lib/heartbeat/ha_logd -s &>/dev/null && \ - /usr/lib/heartbeat/ha_logd -d + CheckBool "`ha_parameter use_logd`" && \ + ( /usr/lib/heartbeat/ha_logd -s &>/dev/null || \ + /usr/lib/heartbeat/ha_logd -d -c /etc/ha.d/ha_logd.cf) RunStartStop pre-start - CheckBool "`ha_parameter crm`" && \ + CheckBool "`ha_parameter crm`" || \ /usr/lib/heartbeat/ResourceManager verifyallidle /usr/lib/heartbeat/heartbeat &>/dev/null @@ -57,8 +59,9 @@ stop() { RunStartStop post-stop ${ret} # stop log subsystem - /usr/lib/heartbeat/ha_logd -s &>/dev/null || \ - /usr/lib/heartbeat/ha_logd -k &>/dev/null + CheckBool "`ha_parameter use_logd`" && \ + ( /usr/lib/heartbeat/ha_logd -s &>/dev/null && \ + /usr/lib/heartbeat/ha_logd -k &>/dev/null ) eend ${ret} } |