X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=virt-p2v.1.html;fp=virt-p2v.1.html;h=89e6f69f1d0c5cab368136a3cc0c059802a0eb9a;hb=3afa1961cd2630eb5b19a6760fbe388f17471358;hp=72130aea7bb1aa7fb7a1f05d82489696977a393e;hpb=863a1c876e5276beb2fcdafd721ae82d5376786f;p=virt-p2v.git

diff --git a/virt-p2v.1.html b/virt-p2v.1.html
index 72130ae..89e6f69 100644
--- a/virt-p2v.1.html
+++ b/virt-p2v.1.html
@@ -144,6 +144,13 @@ from the physical machine's root filesystem.  You should probably try
 this method even though occasionally it does not work.</p>
 </dd>
 </li>
+<dt><strong><a name="item_ask_for_fixed_ip_address_and_gateway">Ask for fixed IP address and gateway</a></strong>
+
+<dd>
+<p>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.</p>
+</dd>
+</li>
 <dt><strong><a name="item_configure_from_the_shell">Configure from the shell</a></strong>
 
 <dd>
@@ -165,6 +172,14 @@ interface would be:</p>
 gateway.</p>
 </dd>
 </li>
+<dt><strong><a name="item_qemu_user_network">QEMU user network</a></strong>
+
+<dd>
+<p>This option configures the network for use inside a QEMU user network
+(<a href="http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC30">http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC30</a>).  It
+should only be used by developers.</p>
+</dd>
+</li>
 </dl>
 <dt><strong><a name="item_devices">Devices</a></strong>
 
@@ -461,9 +476,44 @@ For example, <code>Some [&quot;sda&quot;; &quot;sdb&quot;]</code>.</p>
 <dt><strong><a name="item_network"><code>network</code></a></strong>
 
 <dd>
-<p>Set this to the choice for network setup.  Use either <code>Some Auto</code> or
-<code>Some Shell</code> for auto-configuration or shell (manual) configuration
-respectively.</p>
+<p>Set this to the choice for network setup.  Use one of:</p>
+</dd>
+<dl>
+<dt><strong><a name="item_some_auto"><code>Some Auto</code></a></strong>
+
+<dd>
+<p>for auto-configuration</p>
+</dd>
+</li>
+<dt><strong><a name="item_some_static"><code>Some Static</code></a></strong>
+
+<dd>
+<p>to specify the interface, address, netmask and gateway statically</p>
+</dd>
+</li>
+<dt><strong><a name="item_some_shell"><code>Some Shell</code></a></strong>
+
+<dd>
+<p>to launch a shell</p>
+</dd>
+</li>
+<dt><strong><a name="item_some_qemuusernet"><code>Some QEMUUserNet</code></a></strong>
+
+<dd>
+<p>to use a QEMU user network (developers only)</p>
+</dd>
+</li>
+</dl>
+<dt><strong><a name="item_static_network_config"><code>static_network_config</code></a></strong>
+
+<dd>
+<p>This setting only applies if <a href="#item_network"><code>network</code></a> is set to <a href="#item_some_static"><code>Some Static</code></a>,
+in which case you should set this to the static network settings,
+a tuple of (interface, address, netmask, gateway, nameserver):</p>
+</dd>
+<dd>
+<pre>
+ Some (&quot;eth0&quot;, &quot;192.168.2.5&quot;, &quot;255.255.255.0&quot;, &quot;192.168.2.1&quot;, &quot;192.168.2.1&quot;)</pre>
 </dd>
 </li>
 <dt><strong><a name="item_hypervisor"><code>hypervisor</code></a></strong>