From 3afa1961cd2630eb5b19a6760fbe388f17471358 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Update generated man pages. --- virt-p2v.1 | 45 +++++++++++++++++++++++++++++++++++++++++---- virt-p2v.1.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- virt-p2v.1.txt | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 126 insertions(+), 10 deletions(-) diff --git a/virt-p2v.1 b/virt-p2v.1 index d7db2ab..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 +(). 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" 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.

+
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
@@ -165,6 +172,14 @@ interface would be:

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 @@ -461,9 +476,44 @@ For example, Some ["sda"; "sdb"].

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 diff --git a/virt-p2v.1.txt b/virt-p2v.1.txt index 21815c4..795e739 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 + (). 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 @@ -305,9 +316,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 -- 1.8.3.1