File bnc662816_cluster-glue_hb_report_abspath.patch of Package cluster-glue
# HG changeset patch
# Parent 3cff550e1084f1accc7782ff371739ec84e31330
Low: hb_report: use absolute path when invoking slaves (bnc#662816)
diff -r 3cff550e1084 hb_report/hb_report.in
--- a/hb_report/hb_report.in Wed Mar 13 12:14:10 2013 +0100
+++ b/hb_report/hb_report.in Wed Mar 13 12:18:43 2013 +0100
@@ -27,6 +27,13 @@ unset LANG
export LC_ALL=POSIX
PROG=`basename $0`
+PROGDIR=`dirname $0`
+echo "$PROGDIR" | grep -qs '^/' || {
+ test -f @sbindir@/$PROG &&
+ PROGDIR=@sbindir@
+ test -f $HA_NOARCHBIN/$PROG &&
+ PROGDIR=$HA_NOARCHBIN
+}
# the default syslog facility is not (yet) exported by heartbeat
# to shell scripts
@@ -534,9 +541,9 @@ start_slave_collector() {
debug "running: $LOCAL_SUDO hb_report __slave"
$LOCAL_SUDO hb_report __slave
else
- debug "running: ssh $SSH_OPTS $node \"$SUDO hb_report __slave"
+ debug "running: ssh $SSH_OPTS $node \"$SUDO $PROGDIR/hb_report __slave"
ssh $SSH_OPTS $node \
- "$SUDO hb_report __slave"
+ "$SUDO $PROGDIR/hb_report __slave"
fi | (cd $WORKDIR && tar xf -)
}