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

[Thomas Lange]

Author: lange
Date: 2011-07-20 14:46:13 +0000 (Wed, 20 Jul 2011)
New Revision: 6608

Modified:
   trunk/bin/fai
   trunk/bin/fai-mirror
   trunk/bin/make-fai-nfsroot
   trunk/conf/fai.conf
Log:
remove $MNTPOINT from fai.conf, set default value where needed

$MNTPOINT can still be set in fai.conf


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2011-07-20 14:40:18 UTC (rev 6607)
+++ trunk/bin/fai	2011-07-20 14:46:13 UTC (rev 6608)
@@ -5,7 +5,7 @@
 # fai -- main installation script executed after booting
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 1999-2010 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 1999-2011 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # (c) 2001-2005 by Henning Glawe, glaweh at physik.fu-berlin.de
 # Freie Universitaet Berlin
@@ -53,6 +53,7 @@
     fi
     [ -f $FAI_ETC_DIR/fai.conf ] && . $FAI_ETC_DIR/fai.conf
     : ${FAI:=/var/lib/fai/config} # default value
+    : ${MNTPOINT:=/media/mirror}  # default value
     [ -n "$cspace" ] && FAI_CONFIG_SRC=$cspace
     unset cspace
 

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2011-07-20 14:40:18 UTC (rev 6607)
+++ trunk/bin/fai-mirror	2011-07-20 14:46:13 UTC (rev 6608)
@@ -6,7 +6,7 @@
 # fai-mirror -- create and manage a partial mirror for FAI
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2004-2010, Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2004-2011, Thomas Lange, lange at informatik.uni-koeln.de
 #
 #*********************************************************************
 # This program is free software; you can redistribute it and/or modify
@@ -218,6 +218,7 @@
 [ "$verbose" -eq 1 ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 . $cfdir/make-fai-nfsroot.conf
+: ${MNTPOINT:=/media/mirror}  # default value
 export NFSROOT="$NFSROOT/live/filesystem.dir"
 
 [ -n "$packages" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2011-07-20 14:40:18 UTC (rev 6607)
+++ trunk/bin/make-fai-nfsroot	2011-07-20 14:46:13 UTC (rev 6608)
@@ -120,6 +120,7 @@
 [ "$verbose" ] && echo "Using configuration files from $cfdir"
 . $cfdir/fai.conf
 : ${FAI:=/var/lib/fai/config} # default value
+: ${MNTPOINT:=/media/mirror}  # 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 14:40:18 UTC (rev 6607)
+++ trunk/conf/fai.conf	2011-07-20 14:46:13 UTC (rev 6608)
@@ -25,10 +25,3 @@
 # Access to Debian mirror via NFS mounted directory
 # If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
 #FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
-
-
-# The following variables are read only for almost every user.
-# Do not change them unless you know what you are doing!
-
-# mount point where the mirror will be mounted
-MNTPOINT=/media/mirror