1.1 --- a/docs/user.tex	Tue Oct 12 16:03:33 2004 +0000
     1.2 +++ b/docs/user.tex	Tue Oct 12 17:16:08 2004 +0000
     1.3 @@ -277,8 +277,10 @@ for additional Xend logging functionalit
     1.4  
     1.5  \section{Install Bitkeeper (Optional)}
     1.6  
     1.7 -To fetch a local copy, first download the BitKeeper tools at: \\ {\tt
     1.8 -http://www.bitmover.com/download }
     1.9 +To fetch a local copy, first download the BitKeeper tools.
    1.10 +Download instructions must be obtained by filling out the provided
    1.11 +form at: \\ {\tt
    1.12 +http://www.bitmover.com/cgi-bin/download.cgi }
    1.13  
    1.14  The BitKeeper install program is designed to be run with X.  If X is
    1.15  not available, you can specify the install directory on the command
    1.16 @@ -328,7 +330,7 @@ The Xen source code repository is struct
    1.17  \item[\path{xen/}] The Xen hypervisor itself.
    1.18  \item[\path{linux-2.4.27-xen/}] Linux 2.4 support for Xen
    1.19  \item[\path{linux-2.6.8.1-xen/}] Linux 2.6 support for Xen
    1.20 -\item[\path{doc/}] various documentation files for users and developers
    1.21 +\item[\path{docs/}] various documentation files for users and developers
    1.22  \item[\path{extras/}] currently this contains the Mini OS, aimed at developers
    1.23  \end{description}
    1.24  
    1.25 @@ -340,8 +342,7 @@ following:
    1.26  \begin{itemize}
    1.27  \item Build Xen
    1.28  \item Build the control tools, including Xend
    1.29 -\item Download the ebtables patch for Linux 2.4
    1.30 -\item Download (if necessary) and unpack the Linux 2.4 source code,
    1.31 +\item Download (if necessary) and unpack the Linux 2.6 source code,
    1.32        and patch it for use with Xen
    1.33  \item Build a Linux kernel to use in domain 0 and a smaller
    1.34        unprivileged kernel, which can optionally be used for
    1.35 @@ -354,7 +355,7 @@ more complicated. The makefile needs a `
    1.36  which it will then add the Xen architecture files to. You can tell the
    1.37  makefile the location of the appropriate linux compressed tar file by
    1.38  setting the LINUX\_SRC environment variable, e.g. \\
    1.39 -\verb!# LINUX_SRC=/tmp/linux-2.4.27.tar.gz make world! \\ or by
    1.40 +\verb!# LINUX_SRC=/tmp/linux-2.6.8.1.tar.bz2 make world! \\ or by
    1.41  placing the tar file somewhere in the search path of {\tt LINUX\_SRC\_PATH}
    1.42  which defaults to ``{\tt .:..}". If the makefile can't find a suitable
    1.43  kernel tar file it attempts to download it from kernel.org (this won't
    1.44 @@ -363,16 +364,20 @@ work if you're behind a firewall).
    1.45  After untaring the pristine kernel tree, the makefile uses the {\tt
    1.46  mkbuildtree} script to add the Xen patches the kernel. It then builds
    1.47  two different XenLinux images, one with a ``-xen0'' extension which
    1.48 -contains hardware device drivers and is intended to be used in the
    1.49 -first virtual machine (``domain 0''), and one with a ``-xenU''
    1.50 -extension that just contains virtual-device drivers.
    1.51 +contains hardware device drivers and drivers for Xen's virtual devices,
    1.52 +and one with a ``-xenU'' extension that just contains the virtual ones.
    1.53 +The former is intended to be used in the first virtual machine (``domain 0''),
    1.54 +the latter just has a smaller memory footprint.
    1.55  
    1.56 -The procedure is similar to build the Linux 2.6 port: \\
    1.57 -\verb!# LINUX_SRC=/path/to/linux2.6/source make linux26!
    1.58 +The procedure is similar to build the Linux 2.4 port: \\
    1.59 +\verb!# LINUX_SRC=/path/to/linux2.4/source make linux24!
    1.60  
    1.61  In both cases, if you have an SMP machine you may wish to give the
    1.62  {\tt '-j4'} argument to make to get a parallel build.
    1.63  
    1.64 +XXX Insert details on customising the kernel to be built.
    1.65 +i.e. merging config files
    1.66 +
    1.67  The files produced by the build process are stored under the
    1.68  \path{install/} directory.  To install them in their default
    1.69  locations, do: \\
    1.70 @@ -385,8 +390,8 @@ destinations.
    1.71  Take a look at the files in \path{install/boot/}:
    1.72  \begin{itemize}
    1.73  \item \path{install/boot/xen.gz} The Xen 'kernel'
    1.74 -\item \path{install/boot/vmlinuz-2.4.27-xen0}  Domain 0 XenLinux kernel
    1.75 -\item \path{install/boot/vmlinuz-2.4.27-xenU}  Unprivileged XenLinux kernel
    1.76 +\item \path{install/boot/vmlinuz-2.6.8.1-xen0}  Domain 0 XenLinux kernel
    1.77 +\item \path{install/boot/vmlinuz-2.6.8.1-xenU}  Unprivileged XenLinux kernel
    1.78  \end{itemize}
    1.79  
    1.80  The difference between the two Linux kernels that are built is due to
    1.81 @@ -414,9 +419,9 @@ This file is sometimes called \path{menu
    1.82  distribution.  The entry should look something like the following:
    1.83  
    1.84  \begin{verbatim}
    1.85 -title Xen 2.0 / XenLinux 2.4.27
    1.86 +title Xen 2.0 / XenLinux 2.6.8.1
    1.87    kernel /boot/xen.gz dom0_mem=131072 com1=115200,8n1
    1.88 -  module /boot/vmlinuz-2.4.27-xen0 root=/dev/sda4 ro console=tty0 console=ttyS0
    1.89 +  module /boot/vmlinuz-2.6.8.1-xen0 root=/dev/sda4 ro console=tty0 console=ttyS0
    1.90  \end{verbatim}
    1.91  
    1.92  The first line of the configuration (kernel...) tells GRUB where to
    1.93 @@ -426,10 +431,13 @@ XenLinux kernel that Xen should start an
    1.94  be passed to it.
    1.95  
    1.96  As always when installing a new kernel, it is recommended that you do
    1.97 -not remove the original contents of \path{grub.conf} --- you may want
    1.98 +not remove the original contents of \path{menu.lst} --- you may want
    1.99  to boot up with your old Linux kernel in future, particularly if you
   1.100  have problems.
   1.101  
   1.102 +XXX insert distro specific stuff in here (maybe)
   1.103 +Suse 9.1: no 'ro' option
   1.104 +
   1.105  \subsection{Serial Console}
   1.106  
   1.107  In order to configure serial console output, it is necessary to add a
   1.108 @@ -439,6 +447,9 @@ serial console.  Add the line:
   1.109  
   1.110  {\tt c:2345:respawn:/sbin/mingetty ttyS0}
   1.111  
   1.112 +XXX insert distro specific stuff in here (maybe)
   1.113 +Suse 9.1: different boot scheme (/etc/init.d/)
   1.114 +
   1.115  \section{Test the new install}
   1.116  
   1.117  It should now be possible to restart the system and use Xen.  Reboot