[Fai-commit] r3563 - in trunk/doc: . entities

Wed Jul 12 14:07:43 UTC 2006

Author: lange
Date: 2006-07-12 14:07:42 +0000 (Wed, 12 Jul 2006)
New Revision: 3563

Modified:
   trunk/doc/entities/bootexample.sgml
   trunk/doc/entities/faisetup.sgml
   trunk/doc/fai-guide.sgml
Log:
fix wrong nfsroot path


Modified: trunk/doc/entities/bootexample.sgml
===================================================================

--- trunk/doc/entities/bootexample.sgml	2006-07-12 13:54:19 UTC (rev 3562)
+++ trunk/doc/entities/bootexample.sgml	2006-07-12 14:07:42 UTC (rev 3563)
@@ -32,7 +32,7 @@
 IP-Config: Complete:
    device=eth0, addr=192.168.1.12, mask=255.255.255.0, gw=192.168.1.254,
    host=demohost, domain=localdomain, nis-domain=(none),
-   bootserver=192.168.1.250, rootserver=192.168.1.250, rootpath=/usr/lib/fai/nfsroot,rw,rsize=8192,wsize=8192,acregmin=1800,acregmax=1800,acdirmin=1800,acdirmax=1800
+   bootserver=192.168.1.250, rootserver=192.168.1.250, rootpath=/srv/fai/nfsroot,rw,rsize=8192,wsize=8192,acregmin=1800,acregmax=1800,acdirmin=1800,acdirmax=1800
 Looking up port of RPC 1000003/2 on 192.168.1.250
 Looking up port of RPC 1000005/1 on 192.168.1.250
 VFS: Mounted root (nfs filesystem).

Modified: trunk/doc/entities/faisetup.sgml
===================================================================
--- trunk/doc/entities/faisetup.sgml	2006-07-12 13:54:19 UTC (rev 3562)
+++ trunk/doc/entities/faisetup.sgml	2006-07-12 14:07:42 UTC (rev 3563)
@@ -1,7 +1,7 @@
 <example>
 faiserver[~]# fai-setup 
 Creating FAI nfsroot can take a long time and will
-need more than &nfsrootsize disk space in /usr/lib/fai/nfsroot.
+need more than &nfsrootsize disk space in /srv/fai/nfsroot.
 Creating nfsroot for sarge using debootstrap
 dpkg: base-passwd: dependency problems, but configuring anyway as you request:
  base-passwd depends on libc6 (>= 2.3.2.ds1-4); however:
@@ -11,9 +11,9 @@
 .
 .
 Creating base.tgz
-`/etc/fai/sources.list' -> `/usr/lib/fai/nfsroot/etc/apt/sources.list'
-Upgrading /usr/lib/fai/nfsroot
-Adding additional packages to /usr/lib/fai/nfsroot:
+`/etc/fai/sources.list' -> `/srv/fai/nfsroot/etc/apt/sources.list'
+Upgrading /srv/fai/nfsroot
+Adding additional packages to /srv/fai/nfsroot:
 fai-nfsroot module-init-tools dhcp3-client ssh rdate lshw hwinfo portmap
 bootpc rsync wget rsh-client less dump reiserfsprogs usbutils
 psmisc pciutils hdparm smartmontools parted mdadm lvm2
@@ -30,10 +30,10 @@
 Updating rmt.8.gz (/usr/share/man/man8/rmt.8.gz) to point to /usr/share/man/man8/rmt-dump.8.gz.
 Recovering jove files ... Done.
 Error : Temporary failure in name resolution
-`/etc/fai/fai.conf' -> `/usr/lib/fai/nfsroot/etc/fai/fai.conf'
-`/etc/fai/make-fai-nfsroot.conf' -> `/usr/lib/fai/nfsroot/etc/fai/make-fai-nfsroot.conf'
-`/etc/fai/menu.lst' -> `/usr/lib/fai/nfsroot/etc/fai/menu.lst'
-`/etc/fai/sources.list' -> `/usr/lib/fai/nfsroot/etc/fai/sources.list'
+`/etc/fai/fai.conf' -> `/srv/fai/nfsroot/etc/fai/fai.conf'
+`/etc/fai/make-fai-nfsroot.conf' -> `/srv/fai/nfsroot/etc/fai/make-fai-nfsroot.conf'
+`/etc/fai/menu.lst' -> `/srv/fai/nfsroot/etc/fai/menu.lst'
+`/etc/fai/sources.list' -> `/srv/fai/nfsroot/etc/fai/sources.list'
 Shadow passwords are now on.
 Kernel 2.6.16-fai-kernels installed into the nfsroot.
 DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon.
@@ -53,7 +53,7 @@
 Removing `diversion of /sbin/discover-modprobe to /sbin/discover-modprobe.distrib by fai'
 make-fai-nfsroot finished properly.     <= *
 Adding line to /etc/exports: /srv/fai/config 123.45.6.0/24(async,ro)
-Adding line to /etc/exports: /usr/lib/fai/nfsroot 123.45.6.0/24(async,ro,no_root_squash)
+Adding line to /etc/exports: /srv/fai/nfsroot 123.45.6.0/24(async,ro,no_root_squash)
 Re-exporting directories for NFS kernel daemon...done.
 You have no FAI configuration. Copy the simple examples with:
 cp -a /usr/share/doc/fai/examples/simple/* /srv/fai/config

Modified: trunk/doc/fai-guide.sgml
===================================================================
--- trunk/doc/fai-guide.sgml	2006-07-12 13:54:19 UTC (rev 3562)
+++ trunk/doc/fai-guide.sgml	2006-07-12 14:07:42 UTC (rev 3563)
@@ -457,7 +457,7 @@
 server name which is known by the install clients.<p>
 
 FAI uses <manref name="apt-get" section="8"> to create the nfsroot
-filesystem in <file>/usr/lib/fai/nfsroot</file>. It needs about
+filesystem in <file>/srv/fai/nfsroot</file>. It needs about
 &nfsrootsize; of free disk space. Before setting up FAI, you should get
 the program <prgn>imggen</prgn>,<footnote>Available at the download
 page <httpsite>www.ltsp.org</httpsite> or from the FAI download
@@ -488,7 +488,7 @@
 </tt><p>
 It may help to enter the chroot environment manually
 <example>
-sudo chroot /usr/lib/fai/nfsroot
+sudo chroot /srv/fai/nfsroot
 </example>
 The setup routine adds some lines to <file>/etc/exports</file> to export
 the nfsroot and the configuration space to all hosts that belong to
@@ -738,7 +738,7 @@
  :ms=1024:\
  :hd=/srv/tftp/fai:\
  :hn:bs=auto:\
- :rp=/usr/lib/fai/nfsroot:
+ :rp=/srv/fai/nfsroot:
 
 .failocal:\
  :tc=.faiglobal:\
@@ -830,7 +830,7 @@
 One issue to bear in mind when configuring your DHCP daemon is that the
 daemon needs to supply the nfsroot path to the client because
 the kernel uses a path different from 
-<file>/usr/lib/fai/nfsroot</file> by default.
+<file>/srv/fai/nfsroot</file> by default.
 
 If you make any changes
 to the DHCP daemon configuration, you must restart the daemon.
@@ -864,7 +864,7 @@
 &bootexample;
 
 When the copyright message of FAI is shown, the install client has mounted
-the nfsroot<footnote> <p><file>/usr/lib/fai/nfsroot</file> from the
+the nfsroot<footnote> <p><file>/srv/fai/nfsroot</file> from the
 install server</p> </footnote> to the clients' root directory
 <file>/</file>. This is the whole filesystem for the client at this
 moment. 
@@ -883,7 +883,7 @@
 space directory to the install clients, mostly a problem of missing
 permissions on the server side.
 <example>
-Root-NFS: Server returned error -13 while mounting /usr/lib/fai/nfsroot
+Root-NFS: Server returned error -13 while mounting /srv/fai/nfsroot
 VFS: Unable to mount root fs via NFS, trying floppy.
 VFS: Cannot open root device "nfs" or 02:00
 Kernel panic: VFS Unable to mount root fs on 02:00
@@ -1077,7 +1077,7 @@
 After the install client has booted, only the script
 <file>/usr/sbin/fai</file><footnote><p>Since the root filesystem on
 the clients is mounted via NFS, <prgn>fai</prgn> is located in
-<file>/usr/lib/fai/nfsroot/usr/sbin</file> on the install server.</p>
+<file>/srv/fai/nfsroot/usr/sbin</file> on the install server.</p>
 </footnote> is executed. This is the main script which controls the
 sequence of tasks for FAI. No other scripts in
 <file>/etc/init.d/</file> are executed.


