[Fai-commit] r3414 - trunk/lib

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-15 22:43:25 +0000 (Sat, 15 Apr 2006)
New Revision: 3414

Modified:
   trunk/lib/subroutines
Log:
use /var/log/fai/current-log/showvar.log instead of /tmp/showvar.log


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-04-15 22:39:19 UTC (rev 3413)
+++ trunk/lib/subroutines	2006-04-15 22:43:25 UTC (rev 3414)
@@ -330,24 +330,25 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_defvar() {
 
+    local svar=/var/log/fai/current-log/showvar.log
     cd $FAI/class
     for class in $classes ; do
 	if [ -f $class.var ]; then
 	    [ "$verbose" ] && echo "Executing $class.var"
 	    # show only lines with ++, we cannot use a pipe, since it would call
 	    # _devfar in a subprocess. Then, variables are not defined 
-	    _defvar $class.var > /tmp/showvar.log 2>&1
-	    grep ^++ /tmp/showvar.log
-	    rm /tmp/showvar.log
+	    _defvar $class.var > $svar 2>&1
+	    grep ^++ $svar
+	    rm $svar
 	fi
     done
 
     # /fai/class/S* scripts or hooks can write variable definitions
     # to additonal.var. now source these definitions
     if [ -f $LOGDIR/additional.var ]; then
-	_defvar $LOGDIR/additional.var > /tmp/showvar.log 2>&1
-	grep ^++ /tmp/showvar.log
-	rm /tmp/showvar.log
+	_defvar $LOGDIR/additional.var > $svar 2>&1
+	grep ^++ $svar
+	rm $svar
     fi
     unset class
     # now all variables are defined. Dump them to variables.sh