[Fai-commit] r3922 - in trunk: bin man

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

Author: lange
Date: 2006-09-11 21:15:59 +0000 (Mon, 11 Sep 2006)
New Revision: 3922

Modified:
   trunk/bin/fai
   trunk/bin/make-fai-bootfloppy
   trunk/bin/make-fai-nfsroot
   trunk/man/fai.8
   trunk/man/make-fai-bootfloppy.8
   trunk/man/make-fai-nfsroot.8
Log:
move -c to -C, so now all scripts use -C for cfdir


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/bin/fai	2006-09-11 21:15:59 UTC (rev 3922)
@@ -167,12 +167,12 @@
 	    shift
 	    renewclass=1
 	    ;;
-	-c|--cfdir)
+	-C|--cfdir)
 	    shift
 	    FAI_ETC_DIR=$1
 	    shift
 	    ;;
-	-C|--class)
+	-c|--class)
 
 	    if [ $renewclass -eq 1 ]; then
 		echo "You can't use -c|--classes and -N|--new at the same time."

Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/bin/make-fai-bootfloppy	2006-09-11 21:15:59 UTC (rev 3922)
@@ -27,7 +27,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.7.5, 29-august-2006"
+version="Version 2.8, 11-september-2006"
 set -e
 timeout=15
 mkimage=0
@@ -279,9 +279,9 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main part
 
-while getopts "lBgvf:s:m:hd:c:Fi:I:" opt ; do
+while getopts "lBgvf:s:m:hd:C:Fi:I:" opt ; do
     case "$opt" in
-	c) cfdir=$OPTARG ;;
+	C) cfdir=$OPTARG ;;
 	B) size=2880 ;;
 	l) lilo=1 ;;
 	g) grub=1 ;;

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/bin/make-fai-nfsroot	2006-09-11 21:15:59 UTC (rev 3922)
@@ -46,9 +46,9 @@
 kernelname="$kfile-install"
 merror="properly"
 # option e currently does nothing
-while getopts ervc:f:kKV: opt ; do
+while getopts ervC:f:kKV: opt ; do
     case "$opt" in
-        c) cfdir=$OPTARG ;;
+        C) cfdir=$OPTARG ;;
         v) verbose=1 ; v=-v ;;
         V) kernelname=$OPTARG ;;
         r) recover=1 ;;

Modified: trunk/man/fai.8
===================================================================
--- trunk/man/fai.8	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/man/fai.8	2006-09-11 21:15:59 UTC (rev 3922)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH fai 8 "24 august 2006" "FAI 3"
+.TH fai 8 "11 september 2006" "FAI 3"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -29,10 +29,10 @@
 .TP
 ACTION is required.
 .TP
-.B \-c CFDIR
+.B \-C CFDIR
 Use CFDIR as configuration directory. Default is /etc/fai.
 .TP
-.BI "\-C|\-\-class " class[,class]
+.BI "\-c|\-\-class " class[,class]
 Define classes.  Multiple classes must be comma separated.  If not
 specified, use the shell environment variable $classes (space
 separated).  The first class has lowest priority.

Modified: trunk/man/make-fai-bootfloppy.8
===================================================================
--- trunk/man/make-fai-bootfloppy.8	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/man/make-fai-bootfloppy.8	2006-09-11 21:15:59 UTC (rev 3922)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH make-fai-bootfloppy 8 "9 january 2006" "FAI 2.9"
+.TH make-fai-bootfloppy 8 "11 september 2006" "FAI 3"
 .de }1
 .ds ]X \&\\*(]B\\
 .nr )E 0
@@ -44,7 +44,7 @@
 .B \-B
 Make a big 2.88M floppy instead of the default 1.44M floppy.
 .TP
-.B \-c CFDIR
+.B \-C CFDIR
 Use CFDIR instead of /etc/fai for reading the config file fai.conf.
 .TP
 .B \-d LABEL

Modified: trunk/man/make-fai-nfsroot.8
===================================================================
--- trunk/man/make-fai-nfsroot.8	2006-09-11 21:10:35 UTC (rev 3921)
+++ trunk/man/make-fai-nfsroot.8	2006-09-11 21:15:59 UTC (rev 3922)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH make-fai-nfsroot 8 "5 september 2006" "FAI 3"
+.TH make-fai-nfsroot 8 "11 september 2006" "FAI 3"
 .de }1
 .ds ]X \&\\*(]B\\
 .nr )E 0
@@ -37,7 +37,7 @@
 successfully and >0 if an error occurs.
 .SH OPTIONS
 .TP
-.B \-c CFDIR
+.B \-C CFDIR
 Use CFDIR as configuration directory. Default is /etc/fai.
 .TP
 .B \-f config_file