X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-p2v.1;h=b03b42804ac0be0d2bed0816d098d5723905ddc3;hb=4bc32f7f5b7f18584dd917b4e80c1edeafbc57d2;hp=59e9f10816ccb236185398ed608e28c9a78321aa;hpb=65b46ce56a110e798c9a21f99eb7969f5ca073e3;p=virt-p2v.git

diff --git a/virt-p2v.1 b/virt-p2v.1
index 59e9f10..b03b428 100644
--- a/virt-p2v.1
+++ b/virt-p2v.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VIRT-P2V 1"
-.TH VIRT-P2V 1 "2008-02-04" "virt-p2v-0.9.1" "Virtualization Support"
+.TH VIRT-P2V 1 "2008-02-05" "virt-p2v-0.9.3" "Virtualization Support"
 .SH "NAME"
 virt\-p2v \- P2V (physical to virtual machine) migration tool
 .SH "SUMMARY"
@@ -202,6 +202,10 @@ current options are:
 In this mode, the live \s-1CD\s0 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.
+.IP "Ask for fixed \s-1IP\s0 address and gateway" 4
+.IX Item "Ask for fixed IP address and gateway"
+In this mode the live \s-1CD\s0 will ask you for a fixed \s-1IP\s0 address and
+gateway address, and will configure your chosen interface with these.
 .IP "Configure from the shell" 4
 .IX Item "Configure from the shell"
 In this mode you will be dropped into a command shell and you will
@@ -218,6 +222,11 @@ interface would be:
 .Sp
 where \f(CW\*(C`AA.BB.CC.DD\*(C'\fR is the \s-1IP\s0 address and \f(CW\*(C`GG.HH.II.JJ\*(C'\fR is the
 gateway.
+.IP "\s-1QEMU\s0 user network" 4
+.IX Item "QEMU user network"
+This option configures the network for use inside a \s-1QEMU\s0 user network
+(<http://fabrice.bellard.free.fr/qemu/qemu\-doc.html#SEC30>).  It
+should only be used by developers.
 .RE
 .RS 4
 .RE
@@ -462,9 +471,37 @@ For a logical volume (eg. \f(CW\*(C`/dev/VolGroup00/LogVol00\*(C'\fR), use:
 .ie n .IP """network""" 4
 .el .IP "\f(CWnetwork\fR" 4
 .IX Item "network"
-Set this to the choice for network setup.  Use either \f(CW\*(C`Some Auto\*(C'\fR or
-\&\f(CW\*(C`Some Shell\*(C'\fR for auto-configuration or shell (manual) configuration
-respectively.
+Set this to the choice for network setup.  Use one of:
+.RS 4
+.ie n .IP """Some Auto""" 4
+.el .IP "\f(CWSome Auto\fR" 4
+.IX Item "Some Auto"
+for auto-configuration
+.ie n .IP """Some Static""" 4
+.el .IP "\f(CWSome Static\fR" 4
+.IX Item "Some Static"
+to specify the interface, address, netmask and gateway statically
+.ie n .IP """Some Shell""" 4
+.el .IP "\f(CWSome Shell\fR" 4
+.IX Item "Some Shell"
+to launch a shell
+.ie n .IP """Some QEMUUserNet""" 4
+.el .IP "\f(CWSome QEMUUserNet\fR" 4
+.IX Item "Some QEMUUserNet"
+to use a \s-1QEMU\s0 user network (developers only)
+.RE
+.RS 4
+.RE
+.ie n .IP """static_network_config""" 4
+.el .IP "\f(CWstatic_network_config\fR" 4
+.IX Item "static_network_config"
+This setting only applies if \f(CW\*(C`network\*(C'\fR is set to \f(CW\*(C`Some Static\*(C'\fR,
+in which case you should set this to the static network settings,
+a tuple of (interface, address, netmask, gateway, nameserver):
+.Sp
+.Vb 1
+\& Some ("eth0", "192.168.2.5", "255.255.255.0", "192.168.2.1", "192.168.2.1")
+.Ve
 .ie n .IP """hypervisor""" 4
 .el .IP "\f(CWhypervisor\fR" 4
 .IX Item "hypervisor"
@@ -554,6 +591,11 @@ From the source directory do:
 where \f(CW\*(C`qemuimage.img\*(C'\fR is the name of the \s-1QEMU/KVM\s0 image.
 .PP
 You can also supply an \f(CW\*(C`HDB\*(C'\fR parameter to specify a second disk.
+.SH "MAILING LIST"
+.IX Header "MAILING LIST"
+Please direct questions to the et-mgmt-tools mailing list
+<http://www.redhat.com/mailman/listinfo/et\-mgmt\-tools>
+<et\-mgmt\-tools @ redhat . com>
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIvirsh\fR\|(1),