[Fai-commit] r5313 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2009-04-09 14:48:04 +0000 (Thu, 09 Apr 2009)
New Revision: 5313

Modified:
   trunk/bin/fai-do-scripts
   trunk/debian/changelog
Log:
  call cfagent scripts with -v if fai is in debug mode

Modified: trunk/bin/fai-do-scripts
===================================================================
--- trunk/bin/fai-do-scripts	2009-04-09 13:55:25 UTC (rev 5312)
+++ trunk/bin/fai-do-scripts	2009-04-09 14:48:04 UTC (rev 5313)
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.6.2, 9-apr-2009"
+version="version 1.6.3, 9-apr-2009"
 
 # variables needed: $classes, $cfclasses, $LOGDIR
 # 
@@ -124,7 +124,7 @@
 	*"cfagent"*)
 	    echo "Executing cfagent: $file"
 	    echo "=====   cfagent: $file   =====" >> $LOGDIR/cfagent.log 2>&1
-	    ./$file -qKI -D${cfclasses} >> $LOGDIR/cfagent.log 2>&1
+	    ./$file $cfagentdebug -qKI -D${cfclasses} >> $LOGDIR/cfagent.log 2>&1
 	    fc_check_status $file $? | tee -a $LOGDIR/cfagent.log
 	;;
 
@@ -184,6 +184,8 @@
     exit 9
 fi
 
+[ "$debug" ] && cfagentdebug=-v
+
 call_conf $1
 # move error number from child scripts to 100+x if any error happened
 [ $maxstatus -gt 0 ] && maxstatus=$((100+$maxstatus))

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 13:55:25 UTC (rev 5312)
+++ trunk/debian/changelog	2009-04-09 14:48:04 UTC (rev 5313)
@@ -8,6 +8,7 @@
   * make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
     -k now also upgrades all packages inside the nfsroot
   * fai-do-scripts: skip files with certain suffixes (closes: #500579)
+    call cfagent scripts with -v if fai is in debug mode
   * lib/subroutines-linux: don't rely on ' as a field separator when
     parsing boot.log, use = and strip off any quotes (closes: #439250)
   * lib/get-config-dir-svn: Make username in svn:// config url optional