Blame SOURCES/0029-RHEL-Remove-the-in-place-option.patch

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