[Fai-commit] r4756 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-16 16:35:02 +0000 (Fri, 16 Nov 2007)
New Revision: 4756

Modified:
   trunk/bin/fai
Log:
do not use /var/log/fai/current, cleanup definition of $LOGDIR


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2007-11-16 16:27:03 UTC (rev 4755)
+++ trunk/bin/fai	2007-11-16 16:35:02 UTC (rev 4756)
@@ -256,16 +256,15 @@
 fi
 
 mkdir -p /var/run/fai
-export LOGDIR=/var/log/fai/current
-[ X$action = Xdirinstall ] && export LOGDIR=/var/log/fai/dirinstall/$HOSTNAME
-[ -d $LOGDIR ] && rm -rf $LOGDIR
-mkdir -p $LOGDIR
 
-# for compability, can be removed later
 if [ $do_init_tasks -eq 1 ]; then
-    mkdir /tmp/fai
-    mount --bind $LOGDIR /tmp/fai 
+    # we are running an initial installation
+    export LOGDIR=/tmp/fai
+else
+    fai_rundate=$(date +'%Y%m%d_%H%M%S')
+    export LOGDIR=/var/log/fai/$HOSTNAME/$action-$fai_rundate
 fi
+mkdir -p $LOGDIR
 
 fai_init
 if [ X$action = Xdirinstall ]; then