tftp client no longer required for PXE boot (revert cs 87)

[virt-p2v.git] / virt-p2v.pod

diff --git a/virt-p2v.pod b/virt-p2v.pod
index cf9cc0a..6978b2f 100644 (file)
--- a/virt-p2v.pod
+++ b/virt-p2v.pod
@@ -84,6 +84,11 @@ In this mode, the live CD attempts to reuse the network configuration
 from the physical machine's root filesystem.  You should probably try
 this method even though occasionally it does not work.
 
 from the physical machine's root filesystem.  You should probably try
 this method even though occasionally it does not work.
 

+=item Ask for fixed IP address and gateway
+
+In this mode the live CD will ask you for a fixed IP address and
+gateway address, and will configure your chosen interface with these.
+

 =item Configure from the shell
 
 In this mode you will be dropped into a command shell and you will
 =item Configure from the shell
 
 In this mode you will be dropped into a command shell and you will


@@ -99,6 +104,12 @@ interface would be:
 where C<AA.BB.CC.DD> is the IP address and C<GG.HH.II.JJ> is the
 gateway.
 
 where C<AA.BB.CC.DD> is the IP address and C<GG.HH.II.JJ> is the
 gateway.
 

+=item QEMU user network
+
+This option configures the network for use inside a QEMU user network
+(L<http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC30>).  It
+should only be used by developers.
+

 =back
 
 =item Devices
 =back
 
 =item Devices


@@ -176,6 +187,17 @@ addresses are not tested for uniqueness so there is a very small
 chance that they could coincide, which would leave a guest unable to
 access the virtual network.
 
 chance that they could coincide, which would leave a guest unable to
 access the virtual network.
 

+=item Compression
+
+Choose whether to enable or disable compression on disk images as they
+are copied across the network.
+
+If enabled, the C<-C> option is passed to L<ssh(1)>.  On fast networks
+this can sometimes be slower.
+
+NB: The disk image is still stored uncompressed on the remote host
+however this option is set.
+

 =item Verify and proceed
 
 In this step you are asked to verify the settings above.  If any are
 =item Verify and proceed
 
 In this step you are asked to verify the settings above.  If any are


@@ -356,9 +378,35 @@ For a logical volume (eg. C</dev/VolGroup00/LogVol00>), use:
 
 =item C<network>
 
 
 =item C<network>
 

-Set this to the choice for network setup.  Use either C<Some Auto> or
-C<Some Shell> for auto-configuration or shell (manual) configuration
-respectively.
+Set this to the choice for network setup.  Use one of:
+
+=over 4
+
+=item C<Some Auto>
+
+for auto-configuration
+
+=item C<Some Static>
+
+to specify the interface, address, netmask and gateway statically
+
+=item C<Some Shell>
+
+to launch a shell
+
+=item C<Some QEMUUserNet>
+
+to use a QEMU user network (developers only)
+
+=back
+
+=item C<static_network_config>
+
+This setting only applies if C<network> is set to C<Some Static>,
+in which case you should set this to the static network settings,
+a tuple of (interface, address, netmask, gateway, nameserver):
+
+ Some ("eth0", "192.168.2.5", "255.255.255.0", "192.168.2.1", "192.168.2.1")

 
 =item C<hypervisor>
 
 
 =item C<hypervisor>
 


@@ -399,6 +447,11 @@ reserved for Xen guests.  These MAC addresses are not tested for
 uniqueness so there is a very small chance that they could coincide,
 which would leave a guest unable to access the virtual network.
 
 uniqueness so there is a very small chance that they could coincide,
 which would leave a guest unable to access the virtual network.
 

+=item C<compression>
+
+Set this to C<Some false> to disable compression, or C<Some true> to
+enable compression, or C<None> to ask the user.
+

 =back
 
 =head2 ISO ATTACHMENTS
 =back
 
 =head2 ISO ATTACHMENTS