[Fai-commit] r6607 - in trunk: bin conf

[Thomas Lange]

Author: lange
Date: 2011-07-20 14:40:18 +0000 (Wed, 20 Jul 2011)
New Revision: 6607

Modified:
   trunk/bin/fai
   trunk/bin/fai-cd
   trunk/bin/make-fai-nfsroot
   trunk/conf/fai.conf
Log:
remove variable $FAI from fai.conf, set default value in programs

Alomst noone needs to modify this variable, therefore it's removed
from the default version of fai.conf. It still can be set there.


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2011-07-20 13:58:27 UTC (rev 6606)
+++ trunk/bin/fai	2011-07-20 14:40:18 UTC (rev 6607)
@@ -52,6 +52,7 @@
 	exit 6
     fi
     [ -f $FAI_ETC_DIR/fai.conf ] && . $FAI_ETC_DIR/fai.conf
+    : ${FAI:=/var/lib/fai/config} # default value
     [ -n "$cspace" ] && FAI_CONFIG_SRC=$cspace
     unset cspace
 

Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2011-07-20 13:58:27 UTC (rev 6606)
+++ trunk/bin/fai-cd	2011-07-20 14:40:18 UTC (rev 6607)
@@ -404,6 +404,7 @@
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 . $cfdir/make-fai-nfsroot.conf
+: ${FAI:=/var/lib/fai/config} # default value
 servernfsroot=$NFSROOT
 NFSROOT="$NFSROOT/live/filesystem.dir"
 

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-07-20 13:58:27 UTC (rev 6606)
+++ trunk/bin/make-fai-nfsroot	2011-07-20 14:40:18 UTC (rev 6607)
@@ -119,6 +119,7 @@
 
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
+: ${FAI:=/var/lib/fai/config} # default value
 
 # read config file for this tool
 [ -f "$cfdir/make-fai-nfsroot.conf" ] || die 8 "Can't read $cfdir/make-fai-nfsroot.conf"

Modified: trunk/conf/fai.conf
===================================================================
--- trunk/conf/fai.conf	2011-07-20 13:58:27 UTC (rev 6606)
+++ trunk/conf/fai.conf	2011-07-20 14:40:18 UTC (rev 6607)
@@ -32,6 +32,3 @@
 
 # mount point where the mirror will be mounted
 MNTPOINT=/media/mirror
-
-# the local configuration directory on the install client
-FAI=/var/lib/fai/config