X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-p2v.1.txt;h=81ded1638ad5a87642e1265264fc60901ded3818;hb=8bcc3e22f15e730841bddd4c8aaabbe910c473d3;hp=21815c40ee1e42baccb6d96defdd60a941985bfe;hpb=b4d5de4486026b6bced5736b1ade74c6c715fc28;p=virt-p2v.git

diff --git a/virt-p2v.1.txt b/virt-p2v.1.txt
index 21815c4..81ded16 100644
--- a/virt-p2v.1.txt
+++ b/virt-p2v.1.txt
@@ -71,6 +71,11 @@ STANDARD USAGE
             should probably try this method even though occasionally it does
             not work.
 
+        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.
+
         Configure from the shell
             In this mode you will be dropped into a command shell and you
             will need to issue the correct sequence of "/sbin/ifconfig"
@@ -85,6 +90,12 @@ STANDARD USAGE
             where "AA.BB.CC.DD" is the IP address and "GG.HH.II.JJ" is the
             gateway.
 
+        QEMU user network
+            This option configures the network for use inside a QEMU user
+            network
+            (<http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC30>). It
+            should only be used by developers.
+
     Devices
         This question lists out all local block devices (hard disk drives
         and similar) and asks you to choose which will be sent to the remote
@@ -154,6 +165,16 @@ STANDARD USAGE
         chance that they could coincide, which would leave a guest unable to
         access the virtual network.
 
+    Compression
+        Choose whether to enable or disable compression on disk images as
+        they are copied across the network.
+
+        If enabled, the "-C" option is passed to 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.
+
     Verify and proceed
         In this step you are asked to verify the settings above. If any are
         incorrect, use the *Back* button to navigate back to the setting. If
@@ -305,9 +326,27 @@ BUILDING A CUSTOM LIVE CD
          Some (LV ("VolGroup00", "LogVol00"))
 
     "network"
-        Set this to the choice for network setup. Use either "Some Auto" or
-        "Some Shell" for auto-configuration or shell (manual) configuration
-        respectively.
+        Set this to the choice for network setup. Use one of:
+
+        "Some Auto"
+            for auto-configuration
+
+        "Some Static"
+            to specify the interface, address, netmask and gateway
+            statically
+
+        "Some Shell"
+            to launch a shell
+
+        "Some QEMUUserNet"
+            to use a QEMU user network (developers only)
+
+    "static_network_config"
+        This setting only applies if "network" is set to "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")
 
     "hypervisor"
         Set this to the choice of hypervisor or virtualization system. The
@@ -339,6 +378,10 @@ BUILDING A CUSTOM LIVE CD
         uniqueness so there is a very small chance that they could coincide,
         which would leave a guest unable to access the virtual network.
 
+    "compression"
+        Set this to "Some false" to disable compression, or "Some true" to
+        enable compression, or "None" to ask the user.
+
   ISO ATTACHMENTS
     Rebuilding a custom ISO is time-consuming. You can make a "quick"
     developer ISO by updating an existing ISO image with a new custom