ia64/xen-unstable

changeset 2680:71ca04e8f096

bitkeeper revision 1.1159.1.252 (4177abd31PYu03Ds6umiBSns3W5ORw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-doc
author cl349@freefall.cl.cam.ac.uk
date Thu Oct 21 12:30:11 2004 +0000 (2004-10-21)
parents 6ef02dbe3f30 7421231c8450
children d7a5a934e8d6
files docs/user.tex tools/examples/xmexample1 tools/examples/xmexample2
line diff
     1.1 --- a/docs/user.tex	Thu Oct 21 12:27:55 2004 +0000
     1.2 +++ b/docs/user.tex	Thu Oct 21 12:30:11 2004 +0000
     1.3 @@ -760,7 +760,7 @@ Xen configuration files contain the foll
     1.4  \begin{description}
     1.5  \item[kernel] Path to the kernel image (on the server).
     1.6  \item[ramdisk] Path to a ramdisk image (optional).
     1.7 -\item[builder] The name of the domain build function (e.g. {\tt'linux'} or {\tt'netbsd'}.
     1.8 +% \item[builder] The name of the domain build function (e.g. {\tt'linux'} or {\tt'netbsd'}.
     1.9  \item[memory] Memory size in megabytes.
    1.10  \item[cpu] CPU to assign this domain to.
    1.11  \item[nics] Number of virtual network interfaces.
     2.1 --- a/tools/examples/xmexample1	Thu Oct 21 12:27:55 2004 +0000
     2.2 +++ b/tools/examples/xmexample1	Thu Oct 21 12:30:11 2004 +0000
     2.3 @@ -15,7 +15,6 @@ kernel = "/boot/vmlinuz-2.6.8.1-xenU"
     2.4  
     2.5  # The domain build function. Default is 'linux'.
     2.6  #builder='linux'
     2.7 -#builder='netbsd'
     2.8  
     2.9  # Initial memory allocation (in megabytes) for the new domain.
    2.10  memory = 64
     3.1 --- a/tools/examples/xmexample2	Thu Oct 21 12:27:55 2004 +0000
     3.2 +++ b/tools/examples/xmexample2	Thu Oct 21 12:30:11 2004 +0000
     3.3 @@ -43,7 +43,6 @@ kernel = "/boot/vmlinuz-2.6.8.1-xenU"
     3.4  
     3.5  # The domain build function. Default is 'linux'.
     3.6  #builder='linux'
     3.7 -#builder='netbsd'
     3.8  
     3.9  # Initial memory allocation (in megabytes) for the new domain.
    3.10  memory = 64