diff --git a/tools/crm_failcount.in b/tools/crm_failcount.in
index b2d26e993f..c1c61b4ade 100755
--- a/tools/crm_failcount.in
+++ b/tools/crm_failcount.in
@@ -1,273 +1,273 @@
 #!@BASH_PATH@
 
 USAGE_TEXT="Usage: crm_failcount <command> [<options>]
 Common options:
  --help                 Display this text, then exit
  --version              Display version information, then exit
  -V, --verbose          Specify multiple times to increase debug output
  -q, --quiet            Print only the value (if querying)
 
 Commands:
  -G, --query            Query the current value of the resource's fail count
  -D, --delete           Delete resource's recorded failures
 
 Additional Options:
  -r, --resource=value   Name of the resource to use (required)
  -n, --operation=value  Name of operation to use (instead of all operations)
  -I, --interval=value   If operation is specified, its interval
  -N, --node=value       Use failcount on named node (instead of local node)"
 
 
 HELP_TEXT="crm_failcount - Query or delete resource fail counts
 
 $USAGE_TEXT"
 
 # These constants must track crm_exit_t values
 CRM_EX_OK=0
 CRM_EX_ERROR=1
 CRM_EX_USAGE=64
 CRM_EX_NOSUCH=105
 
 exit_usage() {
 	if [ $# -gt 0 ]; then
 		echo "error: $@" >&2
 	fi
 	echo
 	echo "$USAGE_TEXT"
 	exit $CRM_EX_USAGE
 }
 
 warn() {
 	echo "warning: $@" >&2
 }
 
 interval_re() {
 	echo "^[[:blank:]]*([0-9]+)[[:blank:]]*(${1})[[:blank:]]*$"
 }
 
 # This function should follow crm_get_interval() as closely as possible
 parse_interval() {
 	INT_S="$1"
 
 	INT_8601RE="^P(([0-9]+)Y)?(([0-9]+)M)?(([0-9]+)D)?T?(([0-9]+)H)?(([0-9]+)M)?(([0-9]+)S)?$"
 	
 	if [[ $INT_S =~ $(interval_re "s|sec|") ]]; then
 		echo $(( ${BASH_REMATCH[1]} * 1000 ))
 
 	elif [[ $INT_S =~ $(interval_re "ms|msec") ]]; then
 		echo "${BASH_REMATCH[1]}"
 
 	elif [[ $INT_S =~ $(interval_re "m|min") ]]; then
 		echo $(( ${BASH_REMATCH[1]} * 60000 ))
 
 	elif [[ $INT_S =~ $(interval_re "h|hr") ]]; then
 		echo $(( ${BASH_REMATCH[1]} * 3600000 ))
 
 	elif [[ $INT_S =~ $(interval_re "us|usec") ]]; then
 		echo $(( ${BASH_REMATCH[1]} / 1000 ))
 
 	elif [[ $INT_S =~ ^P([0-9]+)W$ ]]; then
 		echo $(( ${BASH_REMATCH[1]} * 604800000 ))
 
 	elif [[ $INT_S =~ $INT_8601RE ]]; then
 		echo $(( ( ${BASH_REMATCH[2]:-0} * 31536000000 ) \
 			+ ( ${BASH_REMATCH[4]:-0} * 2592000000 ) \
 			+ ( ${BASH_REMATCH[6]:-0} * 86400000 ) \
 			+ ( ${BASH_REMATCH[8]:-0} * 3600000 ) \
 			+ ( ${BASH_REMATCH[10]:-0} * 60000 ) \
 			+ ( ${BASH_REMATCH[12]:-0} * 1000 ) ))
 
 	else
 		warn "Unrecognized interval, using 0"
 		echo "0"
 	fi
 }
 
 query_single_attr() {
 	QSR_TARGET="$1"
 	QSR_ATTR="$2"
 
 	crm_attribute $VERBOSE --quiet --query -t status -d 0 \
 		-N "$QSR_TARGET" -n "$QSR_ATTR"
 }
 
 query_attr_sum() {
 	QAS_TARGET="$1"
 	QAS_PREFIX="$2"
 
 	# Build xpath to match all transient node attributes with prefix
 	QAS_XPATH="/cib/status/node_state[@uname='${QAS_TARGET}']"
 	QAS_XPATH="${QAS_XPATH}/transient_attributes/instance_attributes"
 	QAS_XPATH="${QAS_XPATH}/nvpair[starts-with(@name,'$QAS_PREFIX')]"
 
 	# Query attributes that match xpath
 	# @TODO We ignore stderr because we don't want "no results" to look
 	# like an error, but that also makes $VERBOSE pointless.
 	QAS_ALL=$(cibadmin --query --sync-call --local \
 		--xpath="$QAS_XPATH" 2>/dev/null)
 	QAS_EX=$?
 
 	# "No results" is not an error
 	if [ $QAS_EX -ne $CRM_EX_OK ] && [ $QAS_EX -ne $CRM_EX_NOSUCH ]; then
 		echo "error: could not query CIB for fail counts" >&2
 		exit $QAS_EX
 	fi
 
 	# Extract the attribute values (one per line) from the output
 	QAS_VALUE=$(echo "$QAS_ALL" | sed -n -e \
 		's/.*<nvpair.*value="\([0-9][0-9]*\)".*>.*/\1/p')
 
 	# Sum the values
 	QAS_SUM=0
 	for i in 0 $QAS_VALUE; do
 		QAS_SUM=$(($QAS_SUM + $i))
 	done
 	echo $QAS_SUM
 }
 
 query_failcount() {
 	QF_TARGET="$1"
 	QF_RESOURCE="$2"
 	QF_OPERATION="$3"
 	QF_INTERVAL="$4"
 
 	QF_ATTR_RSC="fail-count-${QF_RESOURCE}"
 
 	if [ -n "$QF_OPERATION" ]; then
 		QF_ATTR_DISPLAY="${QF_ATTR_RSC}#${QF_OPERATION}_${QF_INTERVAL}"
 		QF_COUNT=$(query_single_attr "$QF_TARGET" "$QF_ATTR_DISPLAY")
 	else
 		QF_ATTR_DISPLAY="$QF_ATTR_RSC"
 		QF_COUNT=$(query_attr_sum "$QF_TARGET" "${QF_ATTR_RSC}#")
 	fi
 
 	# @COMPAT attributes set < 1.1.17:
 	# If we didn't find any per-operation failcount,
 	# check whether there is a legacy per-resource failcount.
 	if [ "$QF_COUNT" = "0" ]; then
 		QF_COUNT=$(query_single_attr "$QF_TARGET" "$QF_ATTR_RSC")
 		if [ "$QF_COUNT" != "0" ]; then
 			QF_ATTR_DISPLAY="$QF_ATTR_RSC"
 		fi
 	fi
 
 	# Echo result (comparable to crm_attribute, for backward compatibility)
 	if [ -n "$QUIET" ]; then
 		echo $QF_COUNT
 	else
 		echo "scope=status  name=$QF_ATTR_DISPLAY value=$QF_COUNT"
 	fi
 }
 
 clear_failcount() {
 	CF_TARGET="$1"
 	CF_RESOURCE="$2"
 	CF_OPERATION="$3"
 	CF_INTERVAL="$4"
 
 	if [ -n "$CF_OPERATION" ]; then
 		CF_OPERATION="-n $CF_OPERATION -I ${CF_INTERVAL}ms"
 	fi
 	crm_resource $QUIET $VERBOSE --cleanup \
 		-N "$CF_TARGET" -r "$CF_RESOURCE" $CF_OPERATION
 }
 
 QUIET=""
 VERBOSE=""
 
 command=""
 resource=""
 operation=""
 interval="0"
 target=$(crm_node -n 2>/dev/null)
 
 SHORTOPTS="qDGQVN:U:v:i:l:r:n:I:"
 
 LONGOPTS_COMMON="help,version,verbose,quiet"
 LONGOPTS_COMMANDS="query,delete"
 LONGOPTS_OTHER="resource:,node:,operation:,interval:"
 LONGOPTS_COMPAT="delete-attr,get-value,resource-id:,uname:,lifetime:,attr-value:,attr-id:"
 
 LONGOPTS="$LONGOPTS_COMMON,$LONGOPTS_COMMANDS,$LONGOPTS_OTHER,$LONGOPTS_COMPAT"
 
-TEMP=$(getopt -o $SHORTOPTS --long $LONGOPTS -n crm_failcount -- "$@")
+TEMP=$(@GETOPT_PATH@ -o $SHORTOPTS --long $LONGOPTS -n crm_failcount -- "$@")
 if [ $? -ne 0 ]; then
 	exit_usage
 fi
 eval set -- "$TEMP" # Quotes around $TEMP are essential
 
 while true ; do
 	case "$1" in
 		--help)
 			echo "$HELP_TEXT"
 			exit $CRM_EX_OK
 			;;
 		--version)
 			crm_attribute --version
 			exit $?
 			;;
 		-q|-Q|--quiet)
 			QUIET="--quiet"
 			shift
 			;;
 		-V|--verbose)
 			VERBOSE="$VERBOSE $1"
 			shift
 			;;
 		-G|--query|--get-value)
 			command="--query"
 			shift
 			;;
 		-D|--delete|--delete-attr)
 			command="--delete"
 			shift
 			;;
 		-r|--resource|--resource-id)
 			resource="$2"
 			shift 2
 			;;
 		-n|--operation)
 			operation="$2"
 			shift 2
 			;;
 		-I|--interval)
 			interval="$2"
 			shift 2
 			;;
 		-N|--node|-U|--uname)
 			target="$2"
 			shift 2
 			;;
 		-v|--attr-value)
 			if [ "$2" = "0" ]; then
 				command="--delete"
 			else
 				warn "ignoring deprecated option '$1' with nonzero value"
 			fi
 			shift 2
 			;;
 		-i|--attr-id|-l|--lifetime)
 			warn "ignoring deprecated option '$1'"
 			shift 2
 			;;
 		--)
 			shift
 			break
 			;;
 		*)
 			exit_usage "unknown option '$1'"
 			;;
 	esac
 done
 
 [ -n "$command" ]  || exit_usage "must specify a command"
 [ -n "$resource" ] || exit_usage "resource name required"
 [ -n "$target" ]   || exit_usage "node name required"
 
 interval=$(parse_interval $interval)
 
 if [ "$command" = "--query" ]; then
 	query_failcount "$target" "$resource" "$operation" "$interval"
 else
 	clear_failcount "$target" "$resource" "$operation" "$interval"
 fi
diff --git a/tools/crm_master.in b/tools/crm_master.in
index b9a7755b5e..5177c4f26c 100755
--- a/tools/crm_master.in
+++ b/tools/crm_master.in
@@ -1,103 +1,103 @@
 #!@BASH_PATH@
 
 USAGE_TEXT="Usage: crm_master <command> [<options>]
 Common options:
  --help 		Display this text, then exit
  --version 		Display version information, then exit
  -V, --verbose 		Specify multiple times to increase debug output
  -q, --quiet 		Print only the value (if querying)
 
 Commands:
  -G, --query 		Query the current value of the promotion score
  -v, --update=VALUE	Update the value of the promotion score
  -D, --delete 		Delete the promotion score
 
 Additional Options:
  -N, --node=NODE	Use promotion score on named node (instead of local node)
  -l, --lifetime=VALUE	Until when should the setting take effect
                      	(valid values: reboot, forever)
  -i, --id=VALUE		(Advanced) XML ID used to identify promotion score attribute"
 
 HELP_TEXT="crm_master - Query, update, or delete a resource's promotion score
 
 This program should normally be invoked only from inside an OCF resource agent.
 
 $USAGE_TEXT"
 
 exit_usage() {
 	if [ $# -gt 0 ]; then
 		echo "error: $@" >&2
 	fi
 	echo
 	echo "$USAGE_TEXT"
 	exit 1
 }
 
 SHORTOPTS_DEPRECATED="U:Q"
 LONGOPTS_DEPRECATED="uname:,get-value,delete-attr,attr-value:,attr-id:"
 SHORTOPTS="VqGv:DN:l:i:r:"
 LONGOPTS="help,version,verbose,quiet,query,update:,delete,node:,lifetime:,id:,resource:"
 
-TEMP=$(getopt -o ${SHORTOPTS}${SHORTOPTS_DEPRECATED} \
+TEMP=$(@GETOPT_PATH@ -o ${SHORTOPTS}${SHORTOPTS_DEPRECATED} \
 	--long ${LONGOPTS},${LONGOPTS_DEPRECATED} \
 	-n crm_master -- "$@")
 if [ $? -ne 0 ]; then
 	exit_usage
 fi
 
 eval set -- "$TEMP" # Quotes around $TEMP are essential
 
 # Explicitly set the (usual default) lifetime, so the attribute gets set as a
 # node attribute and not a cluster property.
 options="--lifetime forever"
 
 while true ; do
 	case "$1" in
 		--help) 
 			echo "$HELP_TEXT"
 			exit 0
 			;;
 		--version)
 			crm_attribute --version
 			exit 0
 			;;
 		--verbose|-V|--quiet|-q|--query|-G|--delete|-D)
 			options="$options $1"
 			shift
 			;;
 		--update|-v|--node|-N|--lifetime|-l|--id|-i)
 			options="$options $1 $2"
 			shift
 			shift
 			;;
 		-r|--resource)
 			OCF_RESOURCE_INSTANCE=$2;
 			shift
 			shift
 			;;
 		--get-value|--delete-attr|-Q) # deprecated
 			options="$options $1"
 			shift
 			;;
 		--uname|-U|--attr-value|--attr-id) # deprecated
 			options="$options $1 $2"
 			shift
 			shift
 			;;
 		--)
 			shift
 			break
 			;;
 		*)
 			exit_usage "unknown option '$1'"
 			;;
 	esac
 done
 
 if [ -z "$OCF_RESOURCE_INSTANCE" ]; then
 	echo "This program should normally only be invoked from inside an OCF resource agent."
 	echo "To set a promotion score from the command line, please specify resource with -r."
 	exit 1
 fi
 
 crm_attribute -n master-$OCF_RESOURCE_INSTANCE $options
diff --git a/tools/crm_report.in b/tools/crm_report.in
index 9f2e883f0c..3a3e91b2de 100644
--- a/tools/crm_report.in
+++ b/tools/crm_report.in
@@ -1,477 +1,477 @@
 #!/bin/sh
 
  # Copyright (C) 2010 Andrew Beekhof <andrew@beekhof.net>
  #
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2.1 of the License, or (at your option) any later version.
  #
  # This software is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  # General Public License for more details.
  #
  # You should have received a copy of the GNU General Public
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
 
-TEMP=`getopt				\
+TEMP=`@GETOPT_PATH@			\
     -o hv?xl:f:t:n:T:L:p:c:dSCu:D:MVse:	\
     --long help,cts:,cts-log:,dest:,node:,nodes:,from:,to:,sos-mode,logfile:,as-directory,single-node,cluster:,user:,max-depth:,version,features,rsh:	\
     -n 'crm_report' -- "$@"`
 # The quotes around $TEMP are essential
 eval set -- "$TEMP"
 
 progname=$(basename "$0")
 rsh="ssh -T"
 times=""
 tests=""
 nodes=""
 compress=1
 cluster="any"
 ssh_user="root"
 search_logs=1
 report_data=`dirname $0`
 maxdepth=5
 
 extra_logs=""
 sanitize_patterns="passw.*"
 log_patterns="CRIT: ERROR:"
 
 usage() {
 cat<<EOF
 $progname - Create archive of everything needed when reporting cluster problems
 
 
 Usage: $progname [options] [DEST]
 
 Required option:
   -f, --from TIME       time prior to problems beginning
                         (as "YYYY-M-D H:M:S" including the quotes)
 
 Options:
   -V                    increase verbosity (may be specified multiple times)
   -v, --version         display software version
   --features            display software features
   -t, --to TIME         time at which all problems were resolved
                         (as "YYYY-M-D H:M:S" including the quotes; default "now")
   -T, --cts TEST        CTS test or set of tests to extract
   --cts-log             CTS master logfile
   -n, --nodes NODES     node names for this cluster (only needed if cluster is
                         not active on this host; accepts -n "a b" or -n a -n b)
   -M                    do not search for cluster logs
   -l, --logfile FILE    log file to collect (in addition to detected logs if -M
                         is not specified; may be specified multiple times)
   -p PATT               additional regular expression to match variables to be
                         masked in output (default: "passw.*")
   -L PATT               additional regular expression to match in log files for
                         analysis (default: $log_patterns)
   -S, --single-node     don't attempt to collect data from other nodes
   -c, --cluster TYPE    force the cluster type instead of detecting
                         (currently only corosync is supported)
   -C, --corosync        force the cluster type to be corosync
   -u, --user USER       username to use when collecting data from other nodes
                         (default root)
   -D, --depth           search depth to use when attempting to locate files
   -e, --rsh             command to use to run commands on other nodes
                         (default ssh -T)
   --sos-mode            use defaults suitable for being called by sosreport tool
                         (behavior subject to change and not useful to end users)
   DEST, --dest DEST     custom destination directory or file name
 
 $progname works best when run from a cluster node on a running cluster,
 but can be run from a stopped cluster node or a Pacemaker Remote node.
 
 If neither --nodes nor --single-node is given, $progname will guess the
 node list, but may have trouble detecting Pacemaker Remote nodes.
 Unless --single-node is given, the node names (whether specified by --nodes
 or detected automatically) must be resolvable and reachable via the command
 specified by -e/--rsh using the user specified by -u/--user.
 
 Examples:
    $progname -f "2011-12-14 13:05:00" unexplained-apache-failure
    $progname -f 2011-12-14 -t 2011-12-15 something-that-took-multiple-days
    $progname -f 13:05:00   -t 13:12:00   brief-outage
 EOF
 }
 
 case "$1" in
     -v|--version)   echo "$progname @VERSION@-@BUILD_VERSION@"; exit 0;;
     --features)     echo "@VERSION@-@BUILD_VERSION@: @PCMK_FEATURES@"; exit 0;;
     --|-h|--help) usage; exit 0;;
 esac
 
 # Prefer helpers in the same directory if they exist, to simplify development
 if [ ! -f $report_data/report.common ]; then
     report_data=@datadir@/@PACKAGE@
 else
     echo "Using local helpers"
 fi
 
 . $report_data/report.common
 
 while true; do
     case "$1" in
 	-x) set -x; shift;;
 	-V) verbose=`expr $verbose + 1`; shift;;
 	-T|--cts-test) tests="$tests $2"; shift; shift;;
 	   --cts-log) ctslog="$2"; shift; shift;;
 	-f|--from) start_time=`get_time "$2"`; shift; shift;;
 	-t|--to) end_time=`get_time "$2"`; shift; shift;;
 	-n|--node|--nodes) nodes="$nodes $2"; shift; shift;;
 	-S|--single-node) nodes="$host"; shift;;
 	-E|-l|--logfile) extra_logs="$extra_logs $2"; shift; shift;;
 	-p) sanitize_patterns="$sanitize_patterns $2"; shift; shift;;
 	-L) log_patterns="$log_patterns `echo $2 | sed 's/ /\\\W/g'`"; shift; shift;;
 	-d|--as-directory) compress=0; shift;;
 	-C|--corosync)  cluster="corosync";  shift;;
 	-c|--cluster)   cluster="$2"; shift; shift;;
 	-e|--rsh)       rsh="$2";     shift; shift;;
 	-u|--user)      ssh_user="$2"; shift; shift;;
         -D|--max-depth)     maxdepth="$2"; shift; shift;;
 	-M) search_logs=0; shift;;
         --sos-mode) search_logs=0; nodes="$host"; shift;;
 	--dest) DESTDIR=$2; shift; shift;;
 	--) if [ ! -z $2 ]; then DESTDIR=$2; fi; break;;
 	-h|--help) usage; exit 0;;
 	# Options for compatibility with hb_report
 	-s) shift;;
 
 	*) echo "Unknown argument: $1"; usage; exit 1;;
     esac
 done
 
 
 collect_data() {
     label="$1"
     start=`expr $2 - 10`
     end=`expr $3 + 10`
     masterlog=$4
 
     if [ "x$DESTDIR" != x ]; then
 	echo $DESTDIR | grep -e "^/" -qs
 	if [ $? = 0 ]; then
 	    l_base=$DESTDIR
 	else
 	    l_base="`pwd`/$DESTDIR"
 	fi
 	debug "Using custom scratch dir: $l_base"
 	r_base=`basename $l_base`
     else
 	l_base=$HOME/$label
 	r_base=$label
     fi
 
     if [ -e $l_base ]; then
 	fatal "Output directory $l_base already exists, specify an alternate name with --dest"
     fi
     mkdir -p $l_base
 
     if [ "x$masterlog" != "x" ]; then
 	dumplogset "$masterlog" $start $end > "$l_base/$HALOG_F"
     fi
 
     for node in $nodes; do
 	cat <<EOF >$l_base/.env
 LABEL="$label"
 REPORT_HOME="$r_base"
 REPORT_MASTER="$host"
 REPORT_TARGET="$node"
 LOG_START=$start
 LOG_END=$end
 REMOVE=1
 SANITIZE="$sanitize_patterns"
 CLUSTER=$cluster
 LOG_PATTERNS="$log_patterns"
 EXTRA_LOGS="$extra_logs"
 SEARCH_LOGS=$search_logs
 verbose=$verbose
 maxdepth=$maxdepth
 EOF
 
 	if [ $host = $node ]; then
 	    cat <<EOF >>$l_base/.env
 REPORT_HOME="$l_base"
 EOF
 	    cat $l_base/.env $report_data/report.common $report_data/report.collector > $l_base/collector
 	    bash $l_base/collector
 	else
 	    cat $l_base/.env $report_data/report.common $report_data/report.collector \
 		| $rsh -l $ssh_user $node -- "mkdir -p $r_base; cat > $r_base/collector; bash $r_base/collector" | (cd $l_base && tar mxf -)
 	fi
     done
 
     analyze $l_base > $l_base/$ANALYSIS_F
     if [ -f $l_base/$HALOG_F ]; then
 	node_events $l_base/$HALOG_F > $l_base/$EVENTS_F
     fi
 
     for node in $nodes; do
 	cat $l_base/$node/$ANALYSIS_F >> $l_base/$ANALYSIS_F
 	if [ -s $l_base/$node/$EVENTS_F ]; then
 	    cat $l_base/$node/$EVENTS_F >> $l_base/$EVENTS_F
 	elif [ -s $l_base/$HALOG_F ]; then
 	    awk "\$4==\"$nodes\"" $l_base/$EVENTS_F >> $l_base/$n/$EVENTS_F
 	fi
     done
 
     log " "
     if [ $compress = 1 ]; then
 	fname=`shrink $l_base`
 	rm -rf $l_base
 	log "Collected results are available in $fname"
 	log " "
 	log "Please create a bug entry at"
 	log "    http://bugs.clusterlabs.org/enter_bug.cgi?product=Pacemaker"
 	log "Include a description of your problem and attach this tarball"
 	log " "
 	log "Thank you for taking time to create this report."
     else
 	log "Collected results are available in $l_base"
     fi
     log " "
 }
 
 #
 # check if files have same content in the cluster
 #
 cibdiff() {
     d1=`dirname $1`
     d2=`dirname $2`
     if [ -f $d1/RUNNING -a -f $d2/RUNNING ] ||
 	[ -f $d1/STOPPED -a -f $d2/STOPPED ]; then
 	if which crm_diff > /dev/null 2>&1; then
 	    crm_diff -c -n $1 -o $2
 	else
 	    info "crm_diff(8) not found, cannot diff CIBs"
 	fi
     else
 	echo "can't compare cibs from running and stopped systems"
     fi
 }
 
 diffcheck() {
     [ -f "$1" ] || {
 	echo "$1 does not exist"
 	return 1
     }
     [ -f "$2" ] || {
 	echo "$2 does not exist"
 	return 1
     }
     case `basename $1` in
 	$CIB_F)  cibdiff $1 $2;;
 	$B_CONF) diff -u $1 $2;; # confdiff?
 	*)       diff -u $1 $2;;
 esac
 }
 
 #
 # remove duplicates if files are same, make links instead
 #
 consolidate() {
     for n in $NODES; do
 	if [ -f $1/$2 ]; then
 	    rm $1/$n/$2
 	else
 	    mv $1/$n/$2 $1
 	fi
 	ln -s ../$2 $1/$n
     done
 }
 
 analyze_one() {
     rc=0
     node0=""
     for n in $NODES; do
 	if [ "$node0" ]; then
 	    diffcheck $1/$node0/$2 $1/$n/$2
 	    rc=$(($rc+$?))
 	else
 	    node0=$n
 	fi
     done
     return $rc
 }
 
 analyze() {
     flist="$MEMBERSHIP_F $CIB_F $CRM_MON_F $B_CONF $SYSINFO_F"
     for f in $flist; do
 	printf "Diff $f... "
 	ls $1/*/$f >/dev/null 2>&1 || {
 	    echo "no $1/*/$f :/"
 	    continue
 	}
 	if analyze_one $1 $f; then
 	    echo "OK"
 	    [ "$f" != $CIB_F ] && consolidate $1 $f
 	else
 	    echo ""
 	fi
     done
 }
 
 do_cts() {
     test_sets=`echo $tests | tr ',' ' '`
     for test_set in $test_sets; do
 
 	start_time=0
 	start_test=`echo $test_set | tr '-' ' ' | awk '{print $1}'`
 
 	end_time=0
 	end_test=`echo $test_set | tr '-' ' ' | awk '{print $2}'`
 
 	if [ x$end_test = x ]; then
 	    msg="Extracting test $start_test"
 	    label="CTS-$start_test-`date +"%b-%d-%Y"`"
 	    end_test=`expr $start_test + 1`
 	else
 	    msg="Extracting tests $start_test to $end_test"
 	    label="CTS-$start_test-$end_test-`date +"%b-%d-%Y"`"
 	    end_test=`expr $end_test + 1`
 	fi
 
 	if [ $start_test = 0 ]; then
 	    start_pat="BEGINNING [0-9].* TESTS"
 	else
 	    start_pat="Running test.*\[ *$start_test\]"
 	fi
 
 	if [ x$ctslog = x ]; then
 	    ctslog=`findmsg 1 "$start_pat"`
 
 	    if [ x$ctslog = x ]; then
 		fatal "No CTS control file detected"
 	    else
 		log "Using CTS control file: $ctslog"
 	    fi
 	fi
 
 	line=`grep -n "$start_pat" $ctslog | tail -1 | sed 's/:.*//'`
 	if [ ! -z "$line" ]; then
 	    start_time=`linetime $ctslog $line`
 	fi
 
 	line=`grep -n "Running test.*\[ *$end_test\]" $ctslog | tail -1 | sed 's/:.*//'`
 	if [ ! -z "$line" ]; then
 	    end_time=`linetime $ctslog $line`
 	fi
 
 	if [ -z "$nodes" ]; then
 	    nodes=`grep CTS: $ctslog | grep -v debug: | grep " \* " | sed s:.*\\\*::g | sort -u  | tr '\\n' ' '`
 	    log "Calculated node list: $nodes"
 	fi
 
 	if [ $end_time -lt $start_time ]; then
 	    debug "Test didn't complete, grabbing everything up to now"
 	    end_time=`date +%s`
 	fi
 
 	if [ $start_time != 0 ];then
 	    log "$msg (`time2str $start_time` to `time2str $end_time`)"
 	    collect_data $label $start_time $end_time $ctslog
 	else
 	    fatal "$msg failed: not found"
 	fi
     done
 }
 
 node_names_from_xml() {
     awk '
       /uname/ {
             for( i=1; i<=NF; i++ )
                     if( $i~/^uname=/ ) {
                             sub("uname=.","",$i);
                             sub("\".*","",$i);
                             print $i;
                             next;
                     }
       }
     ' | tr '\n' ' '
 }
 
 getnodes() {
     cluster="$1"
 
     # 1. Live (cluster nodes or Pacemaker Remote nodes)
     # TODO: This will not detect Pacemaker Remote nodes unless they
     # have ever had a permanent node attribute set, because it only
     # searches the nodes section. It should also search the config
     # for resources that create Pacemaker Remote nodes.
     cib_nodes=$(cibadmin -Ql -o nodes 2>/dev/null)
     if [ $? -eq 0 ]; then
 	debug "Querying CIB for nodes"
         echo "$cib_nodes" | node_names_from_xml
         return
     fi
 
     # 2. Saved
     if [ -f "@CRM_CONFIG_DIR@/cib.xml" ]; then
 	debug "Querying on-disk CIB for nodes"
         grep "node " "@CRM_CONFIG_DIR@/cib.xml" | node_names_from_xml
         return
     fi
 
     # 3. logs
     # TODO: Look for something like crm_update_peer
 }
 
 if [ "x$tests" != "x" ]; then
     do_cts
 
 elif [ "x$start_time" != "x" ]; then
     masterlog=""
 
     if [ -z "$sanitize_patterns" ]; then
 	log "WARNING: The tarball produced by this program may contain"
 	log "         sensitive information such as passwords."
 	log ""
 	log "We will attempt to remove such information if you use the"
 	log "-p option. For example: -p \"pass.*\" -p \"user.*\""
 	log ""
 	log "However, doing this may reduce the ability for the recipients"
 	log "to diagnose issues and generally provide assistance."
 	log ""
 	log "IT IS YOUR RESPONSIBILITY TO PROTECT SENSITIVE DATA FROM EXPOSURE"
 	log ""
     fi
 
     # If user didn't specify a cluster stack, make a best guess if possible.
     if [ -z "$cluster" ] || [ "$cluster" = "any" ]; then
         cluster=$(get_cluster_type)
     fi
 
     # If user didn't specify node(s), make a best guess if possible.
     if [ -z "$nodes" ]; then
 	nodes=`getnodes $cluster`
         if [ -n "$nodes" ]; then
             log "Calculated node list: $nodes"
         else
             fatal "Cannot determine nodes; specify --nodes or --single-node"
         fi
     fi
 
     if
 	echo $nodes | grep -qs $host
     then
 	debug "We are a cluster node"
     else
 	debug "We are a log master"
 	masterlog=`findmsg 1 "crmd\\|CTS"`
     fi
 
 
     if [ -z $end_time ]; then
 	end_time=`perl -e 'print time()'`
     fi
     label="pcmk-`date +"%a-%d-%b-%Y"`"
     log "Collecting data from $nodes (`time2str $start_time` to `time2str $end_time`)"
     collect_data $label $start_time $end_time $masterlog
 else
     fatal "Not sure what to do, no tests or time ranges to extract"
 fi
 
 # vim: set expandtab tabstop=8 softtabstop=4 shiftwidth=4 textwidth=80:
diff --git a/tools/crm_standby.in b/tools/crm_standby.in
index 51f815d6e9..b8222aede6 100755
--- a/tools/crm_standby.in
+++ b/tools/crm_standby.in
@@ -1,150 +1,150 @@
 #!@BASH_PATH@
 
 USAGE_TEXT="Usage: crm_standby <command> [options]
 
 Common options:
  --help                 Display this text, then exit
  --version              Display version information, then exit
  -V, --verbose          Specify multiple times to increase debug output
  -q, --quiet            Print only the standby status (if querying)
 
 Commands:
  -G, --query            Query the current value of standby mode (on/off)
  -v, --update=VALUE     Update the value of standby mode (on/off)
  -D, --delete           Let standby mode use default value
 
 Additional Options:
  -N, --node=NODE        Operate on the named node instead of the current one
  -l, --lifetime=VALUE   Until when should the setting take effect
                         (valid values: reboot, forever)
  -i, --id=VALUE         (Advanced) XML ID used to identify standby attribute"
 
 HELP_TEXT="crm_standby - Query, enable, or disable standby mode for a node
 
 Nodes in standby mode may not host cluster resources.
 
 $USAGE_TEXT
 "
 
 exit_usage() {
     if [ $# -gt 0 ]; then
         echo "error: $@" >&2
     fi
     echo
     echo "$USAGE_TEXT"
     exit 1
 }
 
 op=""
 options=""
 lifetime=0
 target=""
 
 SHORTOPTS_DEPRECATED="U:Q"
 LONGOPTS_DEPRECATED="uname:,get-value,delete-attr,attr-value:,attr-id:"
 SHORTOPTS="VqGv:DN:l:i:"
 LONGOPTS="help,version,verbose,quiet,query,update:,delete,node:,lifetime:,id:"
 
-TEMP=$(getopt -o ${SHORTOPTS}${SHORTOPTS_DEPRECATED} \
+TEMP=$(@GETOPT_PATH@ -o ${SHORTOPTS}${SHORTOPTS_DEPRECATED} \
     --long ${LONGOPTS},${LONGOPTS_DEPRECATED} \
     -n crm_standby -- "$@")
 if [ $? -ne 0 ]; then
     exit_usage
 fi
 
 eval set -- "$TEMP" # Quotes around $TEMP are essential
 
 while true ; do
     case "$1" in
         --help)
             echo "$HELP_TEXT"
             exit 0
             ;;
         --version)
             crm_attribute --version
             exit 0
             ;;
         -q|--quiet|-V|--verbose|-Q)
             options="$options $1"
             shift
             ;;
         -N|--node|-U|--uname)
             target="$2"
             shift
             shift
             ;;
         -G|--query|--get-value)
             options="$options --query"
             op=g
             shift
             ;;
         -v|--update|--attr-value)
             options="$options --update $2"
             op=u
             shift
             shift
             ;;
         -D|--delete|--delete-attr)
             options="$options --delete"
             op=d
             shift
             ;;
         -l|--lifetime)
             options="$options --lifetime $2"
             lifetime=1
             shift
             shift
             ;;
         -i|--id|--attr-id)
             options="$options --id $2"
             shift
             shift
             ;;
         --)
             shift
             break
             ;;
         *)
             exit_usage "unknown option '$1'"
             ;;
     esac
 done
 
 # It's important to call cluster commands only after arguments are processed,
 # so --version and --help work without problems even if those commands don't.
 if [ "$target" = "" ]; then
     target=$(crm_node -n)
 fi
 
 options="-N $target -n standby $options"
 if [ x$op = x ]; then
     options="$options -G"; op=g
 fi
 
 # If the user didn't explicitly specify a lifetime ...
 if [ $lifetime -eq 0 ]; then
     case $op in
         g)
             # For query, report the forever entry if one exists, otherwise
             # report the reboot entry if one exists, otherwise report off.
             crm_attribute $options -l forever 2>&1 > /dev/null
             if [ $? -eq 0 ]; then
                 options="$options -l forever"
             else
                 options="$options -l reboot -d off"
             fi
             ;;
         u)
             # For update, default to updating the forever entry.
             options="$options -l forever"
             ;;
         d)
             # For delete, default to deleting both forever and reboot entries.
             crm_attribute $options -l forever
             crm_attribute $options -l reboot
             exit 0
             ;;
     esac
 fi
 
 crm_attribute $options