[Fai-commit] r5451 - in trunk: bin debian man

[Thomas Lange]

Author: lange
Date: 2009-07-19 17:25:07 +0000 (Sun, 19 Jul 2009)
New Revision: 5451

Modified:
   trunk/bin/fai
   trunk/debian/changelog
   trunk/man/fai.8
Log:
fai, fai.8: add option -s/--cspace to specify the config space URL

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-07-19 17:09:34 UTC (rev 5450)
+++ trunk/bin/fai	2009-07-19 17:25:07 UTC (rev 5451)
@@ -52,6 +52,8 @@
 	exit 6
     fi
     [ -f $FAI_ETC_DIR/fai.conf ] && . $FAI_ETC_DIR/fai.conf
+    [ -n "$cspace" ] && FAI_CONFIG_SRC=$cspace
+    unset cspace
 
     if [ -f /etc/RUNNING_FROM_FAICD ]; then   # we are booting from fai cd
 	umount /initrd
@@ -147,7 +149,7 @@
 # Main routine
 
 # Parse commandline options
-TEMP=$(getopt -o u:Nhvc:C: --long hostname:,new,help,verbose,class:,cfdir: -n "$0" -- "$@")
+TEMP=$(getopt -o su:Nhvc:C: --long cspace:,hostname:,new,help,verbose,class:,cfdir: -n "$0" -- "$@")
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 # Note the quotes around `$TEMP': they are essential!
 eval set -- "$TEMP"
@@ -183,6 +185,10 @@
 	    shift
 	    cmdlineclasses=${cmdlineclasses//,/ }
 	    ;;
+	-s|--cspace)
+	    shift
+	    cspace=$1
+	    ;;
 	-u|--hostname)
 	    shift
 	    export newhostname=$1

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-07-19 17:09:34 UTC (rev 5450)
+++ trunk/debian/changelog	2009-07-19 17:25:07 UTC (rev 5451)
@@ -25,6 +25,7 @@
   * fai-server.preinst, fai-server.prerm, fai-quickstart.postinst: print
     warning if FAI_CONFIGDIR is still in the wrong place
   * fai-quickstart.prerm: source make-fai-nfsroot.conf instead of fai.conf
+  * fai, fai.8: add option -s/--cspace to specify the config space URL
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if

Modified: trunk/man/fai.8
===================================================================
--- trunk/man/fai.8	2009-07-19 17:09:34 UTC (rev 5450)
+++ trunk/man/fai.8	2009-07-19 17:25:07 UTC (rev 5451)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH fai 8 "6 September 2008" "FAI 3.2"
+.TH fai 8 "19 July 2009" "FAI 3.3"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -48,6 +48,11 @@
 softupdate if the system was not installed with FAI, you can also use
 it in subsequent runs.
 .TP
+.B \-s|\--cspace <directory>
+URL of the config space. See fai.conf for more information on the
+format and which types of protocol are supported.
+This overrides the setting of FAI_CONFIG_SRC in /etc/fai.
+.TP
 .B \-u|\--hostname <HOSTNAME>
 Use this hostname instead the output of the hostname command. This is
 useful in conjunction with the dirinstall action, where you