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

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-28 15:36:02 +0000 (Mon, 28 Nov 2005)
New Revision: 3114

Modified:
   trunk/bin/make-fai-bootfloppy
   trunk/man/make-fai-bootfloppy.8
Log:
add option -B


Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2005-11-28 00:08:39 UTC (rev 3113)
+++ trunk/bin/make-fai-bootfloppy	2005-11-28 15:36:02 UTC (rev 3114)
@@ -27,10 +27,11 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.6.1, 27-november-2005"
+version="Version 2.7, 28-november-2005"
 set -e
 timeout=15
 mkimage=0
+size=1440
 floppydev=/dev/fd0
 [ -d /floppy ] && mountpoint=/floppy
 [ -d /media  ] && mountpoint=/media/floppy
@@ -61,6 +62,7 @@
 
    Usage: make-fai-bootfloppy [parameter]
 
+   -B         make a big 2.88M floppy instead of the default 1.44M floppy.
    -c CFDIR   use CFDIR instead of /etc/fai as configuration directory
    -d LABEL   use LABEL when selecting the default boot kernel (and parameters).
               a for any boot protocol (kernel tries all compiled in)
@@ -72,9 +74,9 @@
    -h         print this message.
    -F         append default flags to kernel parameters.
               Same as "FAI_FLAGS=verbose,sshd,createvt,syslogd"
-   -f FILE    make a 1440k floppy image in FILE
+   -f FILE    make a floppy image in FILE
    -g         use GRUB loader on bootfloppy (default)
-   -i FILE    make a 1440k iso9660 image in FILE
+   -i FILE    make a iso9660 image in FILE
    -I IF      use IF as the client's network interface
    -l         use LILO loader on bootfloppy
    -m DIR     use DIR as mountpoint [/floppy or /media/floppy]
@@ -277,9 +279,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # main part
 
-while getopts "lgvf: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 ;;
+	B) size=2880 ;;
 	l) lilo=1 ;;
 	g) grub=1 ;;
         h) usage ;;
@@ -327,7 +330,7 @@
 
 if [ $mkimage -eq 1 ]; then 
     [ -e $floppydev ] && die "$floppydev already exists. Please remove it and restart again."
-    dd if=/dev/zero of=$floppydev bs=1024 count=1440
+    dd if=/dev/zero of=$floppydev bs=1024 count=$size
     mountopts="$mountopts -o loop"
     mkfsopt=-F
 else

Modified: trunk/man/make-fai-bootfloppy.8
===================================================================
--- trunk/man/make-fai-bootfloppy.8	2005-11-28 00:08:39 UTC (rev 3113)
+++ trunk/man/make-fai-bootfloppy.8	2005-11-28 15:36:02 UTC (rev 3114)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH make-fai-bootfloppy 8 "23 november 2005" "FAI 2.9"
+.TH make-fai-bootfloppy 8 "28 november 2005" "FAI 2.9"
 .de }1
 .ds ]X \&\\*(]B\\
 .nr )E 0
@@ -41,6 +41,9 @@
 .SH OPTIONS
 
 .TP
+.B \-B
+Make a big 2.88M floppy instead of the default 1.44M floppy.
+.TP
 .B \-c CFDIR
 Use CFDIR instead of /etc/fai for reading the config file fai.conf.
 .TP
@@ -61,10 +64,10 @@
 "FAI_FLAGS=verbose,sshd,createvt,syslogd"
 .TP
 .B \-f FILE
-Make a 1440k floppy image in FILE.
+Make a floppy image in FILE.
 .TP
 .B \-i FILE
-Make a 1440k iso9660 image in FILE (requires also -f FILE).
+Make a iso9660 image in FILE (requires also -f FILE).
 .TP
 .B \-I IF
 Use IF as client interface (default: eth0).