commit e3410ecf4c13dba52d11981b371f4f9c81b369be

Author: Andrew Beekhof <andrew@beekhof.net>

Date:   Wed Sep 25 12:44:58 2013 +1000

    Fix: crm_report: Correctly redirect error message to /dev/null

    (cherry picked from commit 2a977cb7a338fdb1e845c5403485c606b8c9eb2f)

    Conflicts:

    	tools/report.collector

diff --git a/tools/report.collector b/tools/report.collector

index 00bd319..1667364 100644

--- a/tools/report.collector

+++ b/tools/report.collector

@@ -711,6 +711,13 @@ for l in $logfiles $EXTRA_LOGS; do

     cat $b | grep -f $pattfile >> $ANALYSIS_F

 done

+which journalctl > /dev/null 2>&1

+if [ $? = 0 ]; then

+   log "Including segment [$LOG_START-$LOG_END] from journald"

+   journalctl --since "$start" --until "$end" > journal.log

+   cat journal.log | grep -f $pattfile >> $ANALYSIS_F

+fi

+

 rm -f $pattfile

 trap "" 0