[Fai-commit] r3689 - in trunk: bin lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-27 12:45:18 +0000 (Thu, 27 Jul 2006)
New Revision: 3689

Modified:
   trunk/bin/fai
   trunk/lib/prcopyleft
Log:
remove $rcslog, replace with $LOGIDR/fai.log


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-07-27 12:38:09 UTC (rev 3688)
+++ trunk/bin/fai	2006-07-27 12:45:18 UTC (rev 3689)
@@ -88,7 +88,6 @@
 
     # several log files
     diskvar=$LOGDIR/disk_var.sh
-    rcslog=$LOGDIR/fai.log
 
     # variables for cfengine
     target=$FAI_ROOT
@@ -104,7 +103,7 @@
     if [ -n "$HOST" ]; then
 	HOSTNAME=$HOST
 	hostname $HOST
-	echo "Hostname set to $HOST" | tee -a $rcslog
+	echo "Hostname set to $HOST" | tee -a $LOGDIR/fai.log
 	sleep 3
     fi
     export HOSTNAME
@@ -218,7 +217,7 @@
 
 lpipe=$LOGDIR/logfifo
 mkfifo $lpipe
-tee -a $rcslog < $lpipe &
+tee -a $LOGDIR/fai.log < $lpipe &
 # in bash &> redirect stdout and stderr to file
 fstart &> $lpipe
 rm $lpipe
@@ -234,13 +233,13 @@
 # task defvar
 # load_keymap_consolechars
 # set_disk_info
-# } > >( tee -a $rcslog )  2>&1
+# } > >( tee -a $LOGDIR/fai.log )  2>&1
 
 # override FAI_ACTION if a command line argument is given
 [ "$1" ] && FAI_ACTION=$1
 [ "$2" ] && targetdir=$2 # only used for dirinst
 
-task action 2>&1 | tee -a $rcslog
+task action 2>&1 | tee -a $LOGDIR/fai.log
 
 # not happy with this at all!
 [ "$FAI_CVSROOT" ] && rm -rf $FAI

Modified: trunk/lib/prcopyleft
===================================================================
--- trunk/lib/prcopyleft	2006-07-27 12:38:09 UTC (rev 3688)
+++ trunk/lib/prcopyleft	2006-07-27 12:45:18 UTC (rev 3689)
@@ -41,7 +41,7 @@
     osname='Sun Solaris'
 fi
 
-_prcopyleft | tee -a $rcslog
+_prcopyleft | tee -a $LOGDIR/fai.log
 
 if [ $COLOR_FAI_LOGO -eq 1 ]; then
 	echo -ne "\e[7;0r"