|
 |
b85204 |
From ade0fd71c59b362ae7fd6cc07dd91eda9341eafe Mon Sep 17 00:00:00 2001
|
|
|
3156cb |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
3156cb |
Date: Thu, 2 Dec 2021 11:56:05 +0000
|
|
|
3156cb |
Subject: [PATCH] RHEL: Remove the --in-place option
|
|
|
3156cb |
|
|
|
3156cb |
This disables the virt-v2v --in-place option which we do not
|
|
|
3156cb |
wish to support in RHEL.
|
|
|
3156cb |
---
|
|
|
696189 |
docs/virt-v2v.pod | 8 --------
|
|
|
696189 |
tests/Makefile.am | 1 -
|
|
|
696189 |
v2v/v2v.ml | 8 --------
|
|
|
696189 |
3 files changed, 17 deletions(-)
|
|
|
3156cb |
|
|
|
3156cb |
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
|
|
|
b85204 |
index d161b63f..0394b421 100644
|
|
|
3156cb |
--- a/docs/virt-v2v.pod
|
|
|
3156cb |
+++ b/docs/virt-v2v.pod
|
|
|
b85204 |
@@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v).
|
|
|
b85204 |
To estimate the disk space needed before conversion, see
|
|
|
b85204 |
L<virt-v2v-inspector(1)>.
|
|
|
3156cb |
|
|
|
696189 |
-For in-place conversion, there is a separate tool called
|
|
|
696189 |
-L<virt-v2v-in-place(1)>.
|
|
|
3156cb |
-
|
|
|
696189 |
=head2 Input and Output
|
|
|
3156cb |
|
|
|
696189 |
You normally run virt-v2v with several I<-i*> options controlling the
|
|
|
b85204 |
@@ -39,10 +36,6 @@ The input and output sides of virt-v2v are separate and unrelated.
|
|
|
3156cb |
Virt-v2v can read from any input and write to any output. Therefore
|
|
|
3156cb |
these sides of virt-v2v are documented separately in this manual.
|
|
|
3156cb |
|
|
|
3156cb |
-Virt-v2v normally copies from the input to the output, called "copying
|
|
|
3156cb |
-mode". In this case the source guest is always left unchanged.
|
|
|
696189 |
-In-place conversions may be done using L<virt-v2v-in-place(1)>.
|
|
|
3156cb |
-
|
|
|
3156cb |
=head2 Other virt-v2v topics
|
|
|
3156cb |
|
|
|
3156cb |
L<virt-v2v-support(1)> — Supported hypervisors, virtualization
|
|
|
b85204 |
@@ -1612,7 +1605,6 @@ L
|
|
|
3156cb |
|
|
|
696189 |
L<virt-p2v(1)>,
|
|
|
b85204 |
L<virt-v2v-inspector(1)>,
|
|
|
696189 |
-L<virt-v2v-in-place(1)>,
|
|
|
696189 |
L<virt-customize(1)>,
|
|
|
696189 |
L<virt-df(1)>,
|
|
|
696189 |
L<virt-filesystems(1)>,
|
|
|
696189 |
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
|
b85204 |
index a4c87398..998b871d 100644
|
|
|
696189 |
--- a/tests/Makefile.am
|
|
|
696189 |
+++ b/tests/Makefile.am
|
|
|
696189 |
@@ -77,7 +77,6 @@ TESTS = \
|
|
|
696189 |
test-v2v-floppy.sh \
|
|
|
696189 |
test-v2v-i-disk.sh \
|
|
|
696189 |
test-v2v-i-ova.sh \
|
|
|
696189 |
- test-v2v-in-place.sh \
|
|
|
b85204 |
test-v2v-inspector.sh \
|
|
|
696189 |
test-v2v-mac.sh \
|
|
|
696189 |
test-v2v-machine-readable.sh \
|
|
|
3156cb |
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
|
|
|
b85204 |
index 392c3dad..18a694ee 100644
|
|
|
3156cb |
--- a/v2v/v2v.ml
|
|
|
3156cb |
+++ b/v2v/v2v.ml
|
|
|
b85204 |
@@ -216,12 +216,6 @@ let rec main () =
|
|
|
696189 |
warning (f_"the --vmtype option has been removed and now does nothing")
|
|
|
696189 |
in
|
|
|
3156cb |
|
|
|
696189 |
- (* Options that are errors. *)
|
|
|
696189 |
- let in_place_error _ =
|
|
|
696189 |
- error (f_"The --in-place option has been replaced by the \
|
|
|
696189 |
- ‘virt-v2v-in-place’ program")
|
|
|
696189 |
- in
|
|
|
696189 |
-
|
|
|
696189 |
let argspec = [
|
|
|
696189 |
[ L"bandwidth" ], Getopt.String ("bps", set_string_option_once "--bandwidth" bandwidth),
|
|
|
696189 |
s_"Set bandwidth to bits per sec";
|
|
|
b85204 |
@@ -243,8 +237,6 @@ let rec main () =
|
|
|
3156cb |
s_"Use password from file to connect to input hypervisor";
|
|
|
3156cb |
[ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport),
|
|
|
3156cb |
s_"Input transport";
|
|
|
696189 |
- [ L"in-place" ], Getopt.Unit in_place_error,
|
|
|
696189 |
- s_"Use virt-v2v-in-place instead";
|
|
|
3156cb |
[ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac),
|
|
|
3156cb |
s_"Map NIC to network or bridge or assign static IP";
|
|
|
3156cb |
[ S 'n'; L"network" ], Getopt.String ("in:out", add_network),
|