[Fai-commit] r5151 - in trunk: debian man
lange at alioth.debian.org
lange at alioth.debian.org
Tue Sep 16 12:06:58 UTC 2008
Author: lange
Date: 2008-09-16 12:06:57 +0000 (Tue, 16 Sep 2008)
New Revision: 5151
Modified:
trunk/debian/changelog
trunk/man/ainsl.1
trunk/man/fai-cd.8
trunk/man/fai-chboot.8
trunk/man/fai.8
Log:
fai-chboot.8, fai-cd.8, ainsl.1, fai.8: apply patches from Colin Tuckley
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-09-10 23:01:02 UTC (rev 5150)
+++ trunk/debian/changelog 2008-09-16 12:06:57 UTC (rev 5151)
@@ -1,3 +1,9 @@
+fai (3.2.11) unstable; urgency=low
+
+ * fai-chboot.8, fai-cd.8, ainsl.1, fai.8: apply patch from Colin Tuckley
+
+ -- Thomas Lange <lange at debian.org> Tue, 16 Sep 2008 14:06:20 +0200
+
fai (3.2.10) unstable; urgency=low
* add texlive-latex-recommended and texlive-fonts-recommended to
Modified: trunk/man/ainsl.1
===================================================================
--- trunk/man/ainsl.1 2008-09-10 23:01:02 UTC (rev 5150)
+++ trunk/man/ainsl.1 2008-09-16 12:06:57 UTC (rev 5151)
@@ -24,9 +24,9 @@
If PATTERN is not given, LINE is used instead for matching a line in
FILE. Then LINE may also contain the anchors '^' and '$' which
-are only treated special at the beginning or end of the pattern and
+are only treated specialy at the beginning or end of the pattern and
are used for matching, not when adding the line. Additionaly,
-following characters are escaped in LINE: ( ) +
+the following characters are escaped in LINE: ( ) +
.SH OPTIONS
.TP
@@ -49,7 +49,7 @@
Quote * and + metacharacters in pattern.
.TP
.BI "\-s "
-Convert blanks in LINE or PATTERN to '\\s+' regexp for matching.
+Convert white space in LINE or PATTERN to '\\s+' regexp for matching.
.TP
.B \-v
Create verbose output.
@@ -62,14 +62,14 @@
ainsl -s /etc/exports '/srv/www @linuxhosts(async,rw) backup(async,ro)'
-Add exports entry without excatly looking at spaces.
+Add exports entry without exactly matching spaces.
.SH NOTES
-This is a similar function as AppendIfNoSuchLine from cfengine(8).
+This is a similar function to AppendIfNoSuchLine from cfengine(8).
.SH SEE ALSO
.br
This program is part of FAI (Fully Automatic Installation). See the FAI manual
-for more information on how to use fcopy. The FAI homepage is http://www.informatik.uni-koeln.de/fai.
+for more information on how to use ainsl. The FAI homepage is http://www.informatik.uni-koeln.de/fai.
.SH AUTHOR
Thomas Lange <lange at informatik.uni-koeln.de>
Modified: trunk/man/fai-cd.8
===================================================================
--- trunk/man/fai-cd.8 2008-09-10 23:01:02 UTC (rev 5150)
+++ trunk/man/fai-cd.8 2008-09-16 12:06:57 UTC (rev 5151)
@@ -35,7 +35,7 @@
\fI\|\\$1\|\fP
..
.SH NAME
-fai-cd \- make a bootable CD-ROM or USB stick that performs the FAI
+fai-cd \- make a bootable CD-ROM or USB stick that performs an FAI
.SH SYNOPSIS
.B fai-cd
[\fIOPTION\fR] -m MIRROR \fIFILE\fR
@@ -45,18 +45,18 @@
.br
.SH DESCRIPTION
This command creates a bootable ISO CD-ROM image that performs the
-fully automatic installation from CD-ROM without a install server. The
+fully automatic installation from CD-ROM without an install server. The
ISO image will be written to FILE. To create the image, the
-command needs the NFSROOT, the configuration space and a partitial
+command needs the NFSROOT, the configuration space and a partial
mirror, which is created by fai-mirror. The command can also copy all
-needed data to DIRECTORY of an already mounted USB stick.
+needed data to DIRECTORY on a mounted USB stick.
.SH OPTIONS
.TP
.BI \-b
After creating the ISO image burn it by calling cdrecord(1).
.TP
.B \-C CFDIR
-Use CFDIR as configuration directory. Default is /etc/fai. You can
+Use CFDIR as the configuration directory. Default is /etc/fai. You can
also set the environment variable FAI_ETC_DIR.
.TP
.BI \-f
@@ -64,11 +64,11 @@
.TP
.BI "\-g " FILE
Use FILE as grub menu.lst file. The script will looks for FILE in CFDIR.
-If FILE is located in an other directory than CFDIR then a full path
-has to be defined. If not specified, use /etc/fai/menu.lst.
+If FILE is located in another directory then a full path
+must be specified. If not specified, use /etc/fai/menu.lst.
.TP
.BI \-h
-Show simle help and version.
+Show simple help and version.
.TP
.BI \-k
Keep the temporary filesystem for debugging. The script will sleep for
@@ -81,10 +81,10 @@
.TP
.BI \-n
No ISO image. Do not call mkisofs to create the ISO image. This is for
-creating the filesystem only. Useful for writing it to USB stick.
+creating the filesystem only. Useful for writing it to a USB stick.
.TP
.BI "\-u " DIRECTORY
-Create a bootable USB stick. The USB stick needs to be mounted to
+Create a bootable USB stick. The USB stick must be mounted on
DIRECTORY before you run fai-cd. Copies all FAI-CD data to DIRECTORY
and try to install grub onto its device. Currently the file system
on the USB stick must be ext2. USUALLY THIS WILL ERASE ALL DATA ON YOUR USB-STICK!
@@ -96,7 +96,7 @@
# fai-cd -m /media/mirror fai-cd.iso
-If you like to create a bootable USB stick, create an ext2 file system
+If you want to create a bootable USB stick, create an ext2 file system
on your stick, mount it to /media/usbstick and call
# fai-cd -m /media/mirror -u /media/usbstick
Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8 2008-09-10 23:01:02 UTC (rev 5150)
+++ trunk/man/fai-chboot.8 2008-09-16 12:06:57 UTC (rev 5151)
@@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*-
-.TH fai-chboot 8 "7 september" "FAI 3.2"
+.TH fai-chboot 8 "7 September 2008" "FAI 3.2"
.SH NAME
fai-chboot \- manage the network boot configuration files
.SH SYNOPSIS
@@ -44,20 +44,20 @@
them for network booting.
.TP
.BI "\-C " CFDIR
-Use CFDIR as configuration directory. Default is /etc/fai. You can
+Use CFDIR as the configuration directory. Default is /etc/fai. You can
also set the environment variable FAI_ETC_DIR.
.TP
.BI "\-D " DIR
-Set the default directory for the network boot configuration to
+Set the directory for the network boot configuration to
DIR. The default value is /srv/tftp/fai/pxelinux.cfg/.
.TP
.B \-d
-Disable network booting for HOST. This renames the config file and adds
+Disable network booting for HOST. This renames the config file adding
the suffix .disable to it.
.TP
.B \-e
-Reenable network booting for HOST. This renames the config file and removes
-the suffix .disable from it, so the next time it uses the old PXE configuration.
+Reenable network booting for HOST. This renames the config file removing
+the suffix .disable from it, so the next time it uses the PXE configuration.
.TP
.BI "\-f " fai_flags
Set FAI_FLAGS. The flags must be comma separated.
@@ -85,8 +85,8 @@
given, list only hosts matching PATTERN. Lists hostname, FAI_ACTION,
kernel name and IP address in hex. Use \fB\-le\fR, to list only enabled hosts,
\fB-ld\fR to list only disabled hosts, \fB-lt\fR to list only templates,
-\fB-lo\fR to list only hosts that do not match any of the other before
-mentioned categories, and \fB-lg\fR to list the configuration for all hosts,
+\fB-lo\fR to list only hosts that do not match any of the
+previous categories, and \fB-lg\fR to list the configuration for all hosts,
sorted and ordered by groups (enabled, disabled, templates, others).
Note that a combination of multiple \fB-l\fR options is not supported and that
in listing mode no other action will be performed.
@@ -96,7 +96,7 @@
If PATTERN is given, list only hosts matching PATTERN.
.TP
.B \-n
-Do not create configuration but show what will be done. This also
+Do not create configuration but show what would be done. This also
enables the verbose flag.
.TP
.BI \-o
@@ -151,7 +151,7 @@
.TP
fai-chboot -o default
All hosts, that do not have a PXE configuration for their IP-address
-will do a localboot, means booting from local disk.
+will do a localboot, i.e. booting from local disk.
.SH NOTES
Currently only PXE boot is supported. BOOTP configuration can be
@@ -160,7 +160,7 @@
.SH SEE ALSO
.br
This program is part of FAI (Fully Automatic Installation). See the FAI manual
-for more information on how to use fcopy. The FAI homepage is http://www.informatik.uni-koeln.de/fai.
+for more information on how to use fai-chboot. The FAI homepage is http://www.informatik.uni-koeln.de/fai.
.SH AUTHOR
Thomas Lange <lange at informatik.uni-koeln.de>
Modified: trunk/man/fai.8
===================================================================
--- trunk/man/fai.8 2008-09-10 23:01:02 UTC (rev 5150)
+++ trunk/man/fai.8 2008-09-16 12:06:57 UTC (rev 5151)
@@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*-
-.TH fai 8 "22 june 2007" "FAI 3.2"
+.TH fai 8 "6 September 2008" "FAI 3.2"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -21,7 +21,7 @@
.B fai
.RI [ options ] " dirinstall DIRECTORY"
.SH DESCRIPTION
-fai starts a fai-action, e.g. an installation or a softupdate.
+fai starts an fai-action, e.g. an installation or a softupdate.
If the variable FAI_ACTION is defined, this action will be
performed. The command line argument will override the value of
FAI_ACTION. You can also define your own actions which will be
@@ -31,7 +31,7 @@
ACTION is required.
.TP
.B \-C CFDIR
-Use CFDIR as configuration directory. Default is /etc/fai.
+Use CFDIR as the configuration directory. Default is /etc/fai.
.TP
.BI "\-c|\-\-class " class[,class]
Define classes. Multiple classes must be comma separated. If not
@@ -44,18 +44,18 @@
.B \-N|\-\-new
Renew the list of defined classes. By default, FAI uses the list of
classes which was created during the first installation and skips
-calling fai-class(1). You need to use this option for the first
-softupdate if the system was not installed with FAI, and you can use
-it in subsequent runs as well.
+calling fai-class(1). You need this option for the first
+softupdate if the system was not installed with FAI, you can also use
+it in subsequent runs.
.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 most
-probably want to manually define a hostname that should be used for
+useful in conjunction with the dirinstall action, where you
+want to manually define a hostname that should be used for
defining classes and for the network setup and other stuff. There, you
-most probably don't want the name of the host where you run fai
-dirinstall on be used - because programs in a chroot, or in a
-virtualized OS instance should run on their own name, and install
+don't want the name of the host where you run fai
+dirinstall to be used - because programs in a chroot, or in a
+virtualized OS instance should run with their own name, and install
their own set of classes.
.TP
.B \-v|\-\-verbose
@@ -63,7 +63,7 @@
.SH ACTIONS
.TP
.B install
-starts an fully automatic installation:
+starts a fully automatic installation:
.RS
.IP 1. 3
setup the fai environment (create ramdisk, get configuration data,...)
@@ -81,7 +81,7 @@
.TP
.B sysinfo
-starts a system rescue system
+starts a system rescue:
.RS
.IP 1. 3
setup the fai environment (create ramdisk, get configuration data,...)
@@ -113,7 +113,7 @@
.TP
.B dirinstall [DIR]
-Installation into a directory. This is nearly the same as action
+Installation into a directory. This is nearly the same action as
install except for skipping the task that partitions the hard disks and
creates the file systems. Classes can be defined with option -c, or by
giving the hostname with -u or --hostname and enabling automatic definition
@@ -121,7 +121,7 @@
executed)
.SH NOTES
-Running with action "install" on an already running system will almost
+Running with action "install" on a running system will almost
certainly destroy it.
.SH EXAMPLES
More information about the Fai-commit
mailing list