[Fai-commit] r3418 - trunk/bin
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Tue Apr 18 13:37:57 UTC 2006
Author: lange
Date: 2006-04-18 13:37:56 +0000 (Tue, 18 Apr 2006)
New Revision: 3418
Modified:
trunk/bin/fai
Log:
use /var/log/fai/current-log as default LOGDIR,
/tmp/fai is currently a mount --bind to it
Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai 2006-04-17 21:23:48 UTC (rev 3417)
+++ trunk/bin/fai 2006-04-18 13:37:56 UTC (rev 3418)
@@ -206,14 +206,11 @@
# Solaris has already a writable /tmp directory
[ "$oclass" = LINUX -a $DO_INIT_TASKS -eq 1 ] && create_ramdisk
- # directory where temporary log files are stored
- # set default value if nothing is set in fai.conf
- if [ -z "$LOGDIR" -a $DO_INIT_TASKS -eq 1 ]; then
- export LOGDIR=/var/log/fai/current-log
- mkdir -p $LOGDIR
- fi
- [ $DO_INIT_TASKS -eq 0 ] && LOGDIR=$(mktemp -t -d fai.XXXXXX)
- ln -s $LOGDIR $rundir/current_log
+ export LOGDIR=/var/log/fai/current-log
+ mkdir -p $LOGDIR
+ # for compability, can be removed later
+ mkdir /tmp/fai
+ mount --bind /var/log/fai/current-log /tmp/fai
fai_init
@@ -245,7 +242,6 @@
# not happy with this at all!
[ "$FAI_CVSROOT" ] && rm -rf $FAI
-rm -rf $LOGDIR
[ -L "$rundir/current_log" ] && rm -f "$rundir/current_log"
[ -L "$rundir/current_config" ] && rm -f "$rundir/current_config"
More information about the Fai-commit
mailing list