[Fai-commit] r3852 - trunk/bin

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

Author: lange
Date: 2006-09-05 12:14:38 +0000 (Tue, 05 Sep 2006)
New Revision: 3852

Modified:
   trunk/bin/fai
Log:
define $cfdir later, unset after use


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-09-05 12:11:35 UTC (rev 3851)
+++ trunk/bin/fai	2006-09-05 12:14:38 UTC (rev 3852)
@@ -37,7 +37,6 @@
 
 faimond=0
 export renewclass=0
-cfdir=/etc/fai
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 fai_init() {
 
@@ -49,6 +48,7 @@
 	exit 6
     fi
     [ -f $cfdir/fai.conf ] && . $cfdir/fai.conf
+    unset cfdir
 
     if [ -f /boot/RUNNING_FROM_FAICD ]; then   # we are booting from fai cd
 	umount /initrd
@@ -150,6 +150,7 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main routine
 
+cfdir=/etc/fai
 # Parse commandline options
 TEMP=$(getopt -o Nhvc:C: --long new,help,verbose,class:,cfdir: -n "$0" -- "$@")
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi