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

[Thomas Lange]

Author: lange
Date: 2011-10-22 22:27:09 +0000 (Sat, 22 Oct 2011)
New Revision: 6737

Modified:
   trunk/bin/fai
   trunk/bin/fai-setup
   trunk/conf/fai.conf
Log:
use default value for FAI_LOGPROTO


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2011-10-22 22:18:52 UTC (rev 6736)
+++ trunk/bin/fai	2011-10-22 22:27:09 UTC (rev 6737)
@@ -50,6 +50,7 @@
     [ -f $FAI_ETC_DIR/fai.conf ] && . $FAI_ETC_DIR/fai.conf
     : ${FAI:=/var/lib/fai/config} # default value
     : ${MNTPOINT:=/media/mirror}  # default value
+    : ${FAI_LOGPROTO:=ssh}        # default value
     [ -n "$cspace" ] && FAI_CONFIG_SRC=$cspace
     unset cspace
 

Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2011-10-22 22:18:52 UTC (rev 6736)
+++ trunk/bin/fai-setup	2011-10-22 22:27:09 UTC (rev 6737)
@@ -47,6 +47,8 @@
 . $cfdir/fai.conf
 . $cfdir/make-fai-nfsroot.conf
 
+: ${FAI_LOGPROTO:=ssh}
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 add_export_line() {
 

Modified: trunk/conf/fai.conf
===================================================================
--- trunk/conf/fai.conf	2011-10-22 22:18:52 UTC (rev 6736)
+++ trunk/conf/fai.conf	2011-10-22 22:27:09 UTC (rev 6737)
@@ -20,7 +20,8 @@
 #LOGUSER=fai
 
 # set protocol type for saving logs. Values: ssh, rsh, ftp
-FAI_LOGPROTO=ssh
+# defaults to ssh, will be used only if LOGUSER is also set
+#FAI_LOGPROTO=ssh
 
 # Access to Debian mirror via NFS mounted directory
 # If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT