[Fai-commit] r6015 - in branches/stable/3.4: debian man

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:38 +0000 (Tue, 17 Aug 2010)
New Revision: 6015

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/man/fai-cd.8
Log:
fai-cd.8: add option -G


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:31 UTC (rev 6014)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:38 UTC (rev 6015)
@@ -73,6 +73,7 @@
   * Makefile: add support for small pixmaps in faimond-gui
   * fai-guide.txt: add info how to generate the encrypted password
   * control: update to new standards version
+  * fai-cd.8: add option -G
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/man/fai-cd.8
===================================================================
--- branches/stable/3.4/man/fai-cd.8	2010-08-17 12:56:31 UTC (rev 6014)
+++ branches/stable/3.4/man/fai-cd.8	2010-08-17 12:56:38 UTC (rev 6015)
@@ -71,10 +71,18 @@
 .BI \-f
 Force removal of an existing ISO image before creating a new one.
 .TP
+.BI "\-G " INTEGER 
+Use INTEGER as version number for grub boot loader. By default,
+grub2 (grub-pc) is used. fai-cd tries to find the named grub version
+in NFSROOT first. If this version is not installed, it downloads
+the appropriate grub package and uses these files without acutally
+installing it.
+.TP
 .BI "\-g " FILE
-Use FILE as grub menu.lst file. The script will looks for FILE in CFDIR.
-If FILE is located in another directory then a full path
-must be specified. If not specified, use /etc/fai/menu.lst.
+Use FILE as grub grub.cfg/menu.lst file. The script will look for FILE
+in CFDIR. If FILE is located in another directory then a full path
+must be specified. If not specified, use /etc/fai/grub.cfg for grub2 or
+/etc/fai/menu.lst for grub1.
 .TP
 .B \-G GRUBVERSION
 Specify which grub version should be used. Either 1 or 2, the default
@@ -133,10 +141,16 @@
 .FN /etc/fai/fai.conf
 The FAI configuration file.
 .TP
+.FN /etc/fai/grub.cfg
+The default grub2 menu configuration file for fai-cd.
+.TP
 .FN /etc/fai/menu.lst
-The default grub menu configuration file for fai-cd.
+The default grub1 menu configuration file for fai-cd.
 .TP
+.FN /usr/share/fai/grub.cfg
+The default grub2 menu configuration file when using \-B.
+.TP
 .FN /usr/share/fai/menu.lst
-The default grub menu configuration file when using \-B.
+The default grub1 menu configuration file when using \-B.
 .SH AUTHOR
 Thomas Lange <lange at informatik.uni-koeln.de>