[Fai-commit] r4348 - in trunk: conf doc examples/simple/class examples/simple/scripts/FAIBASE man
lange at alioth.debian.org
lange at alioth.debian.org
Thu Jun 14 20:54:15 UTC 2007
Author: lange
Date: 2007-06-14 20:54:15 +0000 (Thu, 14 Jun 2007)
New Revision: 4348
Modified:
trunk/conf/sources.list
trunk/doc/fai-guide.sgml
trunk/examples/simple/class/10-base-classes
trunk/examples/simple/class/20-hwdetect.source
trunk/examples/simple/class/FAIBASE.var
trunk/examples/simple/scripts/FAIBASE/20-removable_media
trunk/man/fai-chboot.8
trunk/man/install_packages.8
Log:
add some minor patches fixing english text, fix /floppy path (closes: #428857, #428858, #428859)
Modified: trunk/conf/sources.list
===================================================================
--- trunk/conf/sources.list 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/conf/sources.list 2007-06-14 20:54:15 UTC (rev 4348)
@@ -1,5 +1,5 @@
# These lines should work for many sites
-# A more comprehensive example can be found in /usr/share/doc/fai/examples/etc
+# A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
deb http://ftp.debian.org/debian etch main contrib non-free
#deb http://ftp.debian.org/debian etch-proposed-updates main contrib non-free
Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/doc/fai-guide.sgml 2007-06-14 20:54:15 UTC (rev 4348)
@@ -1374,9 +1374,9 @@
<p>
The installation script uses many subroutines, which are defined in
-<file>/usr/share/fai/subroutines</file>, and an operating system specific
-file <footnote><file>/usr/share/fai/subroutines-linux</file> for Linux,
-<file>/usr/share/fai/subroutines-sunos</file> for Solaris.</footnote>.
+<file>/usr/lib/fai/subroutines</file>, and an operating system specific
+file <footnote><file>/usr/lib/fai/subroutines-linux</file> for Linux,
+<file>/usr/lib/fai/subroutines-sunos</file> for Solaris.</footnote>.
All important tasks of the
installation are called via the subroutine <tt>task</tt>
appended by the name of the task as an option (e.g. <tt>task
Modified: trunk/examples/simple/class/10-base-classes
===================================================================
--- trunk/examples/simple/class/10-base-classes 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/examples/simple/class/10-base-classes 2007-06-14 20:54:15 UTC (rev 4348)
@@ -1,6 +1,6 @@
#! /bin/bash
-# echo architecture and OS name in upper case. Do NOT remove these two lines
+# Echo architecture and OS name in uppercase. Do NOT remove these two lines.
uname -s | tr '[:lower:]' '[:upper:]'
[ -x "`which dpkg`" ] && dpkg --print-installation-architecture | tr a-z A-Z
Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/examples/simple/class/20-hwdetect.source 2007-06-14 20:54:15 UTC (rev 4348)
@@ -2,7 +2,7 @@
# (c) Thomas Lange, 2002-2005, lange at informatik.uni-koeln.de
-# NOTE: Files named *.source will be evaluated, but their output ignored and instead
+# NOTE: Files named *.source will be evaluated, but their output ignored. Instead
# the contents of $newclasses will be added to the list of defined classes.
echo 0 > /proc/sys/kernel/printk
@@ -14,7 +14,7 @@
for i in $mod; do
modprobe $i 1>/dev/null 2>&1
done
-# Booting from CD does not enable dma always
+# Booting from CD does not always enable DMA.
for d in $( echo /proc/ide/hd[a-z] 2>/dev/null); do
[ -d $d ] && echo "using_dma:1" > $d/settings
done
@@ -36,7 +36,7 @@
# let discover do most of the job
[ -x /sbin/discover-modprobe ] && /sbin/discover-modprobe
-# now we can mount the usb file system
+# now we can mount the USB filesystem
mount -t usbfs usbfs /proc/bus/usb
modprobe -a sd_mod sr_mod
@@ -44,7 +44,7 @@
echo 6 > /proc/sys/kernel/printk
# try to detect graphics card
-# the variable VIDEODRIVER may be used to generate the XF86config file
+# the variable VIDEODRIVER may be used to generate the xorg.conf file
[ -x "$(which discover)" ] && {
if discover --version | grep "discover \(version \)*1\." ; then
VIDEODRIVER=$(discover --xdriver video 2> /dev/null)
Modified: trunk/examples/simple/class/FAIBASE.var
===================================================================
--- trunk/examples/simple/class/FAIBASE.var 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/examples/simple/class/FAIBASE.var 2007-06-14 20:54:15 UTC (rev 4348)
@@ -1,6 +1,6 @@
# default values for installation. You can override them in your *.var files
-# allow installation of pacakges from unsigned repositories
+# allow installation of packages from unsigned repositories
FAI_ALLOW_UNSIGNED=1
CONSOLEFONT=
@@ -14,7 +14,7 @@
# pw is "fai"
ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
-# moduleslist contains modules that will be loaded by the new system,
+# MODULESLIST contains modules that will be loaded by the new system,
# not during installation these modules will be written to /etc/modules
# If you need a module during installation, add it to $kernelmodules
# in 20-hwdetect.source. But discover should do most of this job
Modified: trunk/examples/simple/scripts/FAIBASE/20-removable_media
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/20-removable_media 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/examples/simple/scripts/FAIBASE/20-removable_media 2007-06-14 20:54:15 UTC (rev 4348)
@@ -3,7 +3,7 @@
# (c) Thomas Lange, 2006, lange at debian.org
# create entries for removable media in fstab and directories in /media
-ainsl $target/etc/fstab "/dev/fd0 /floppy auto users,noauto 0 0"
+ainsl $target/etc/fstab "/dev/fd0 /media/floppy auto users,noauto 0 0"
cdromlist() {
[ -f /proc/sys/dev/cdrom/info ] || return
Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/man/fai-chboot.8 2007-06-14 20:54:15 UTC (rev 4348)
@@ -63,7 +63,7 @@
verbose,sshd,createvt
.TP
.B \-h
-Show simle help and version.
+Show simple help and version.
.TP
.B \-i
Set parameters for booting the FAI install kernel. Same as -k "ip=dhcp" vmlinuz-install /dev/nfs. This does not set FAI_ACTION.
@@ -71,7 +71,7 @@
.B \-I
Same as -i but also sets FAI_ACTION=install. So a fully automatic
installation will be performed. ATTENTION! This will erase most of the
-data on the install clients local disks.
+data on the local disks of the install clients.
.TP
.BI "\-k " parameters
Set kernel append parameters.
Modified: trunk/man/install_packages.8
===================================================================
--- trunk/man/install_packages.8 2007-06-14 10:25:09 UTC (rev 4347)
+++ trunk/man/install_packages.8 2007-06-14 20:54:15 UTC (rev 4348)
@@ -45,7 +45,7 @@
remove, or purge packages or tasks.
install_packages is called from the custom fai_rcS script and should not be
-called directly. It's function is to parse the package_config files based on
+called directly. Its function is to parse the package_config files based on
the class definitions of the client. For example, if the client belonged to
the SMTPSERVER class, install_packages would parse ../package_config/SMTPSERVER
for instructions on what packages to install, hold, remove, or purge.
More information about the Fai-commit
mailing list