Update RHEL patches.

This commit is contained in:
Richard W.M. Jones 2021-04-27 17:58:39 +01:00
parent 989dd6b636
commit 4ba366e0fb
9 changed files with 29 additions and 16 deletions

View File

@ -1,4 +1,4 @@
From 9918c857eca2ce4efddb4ed9f17dccfc6144471f Mon Sep 17 00:00:00 2001 From 21781d79e323f7eaee7deb6981ecb783e35a39af Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Sep 2014 19:14:43 +0100 Date: Sun, 28 Sep 2014 19:14:43 +0100
Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode

View File

@ -1,4 +1,4 @@
From 51d18cc8da56f5b8395ae2f5edd6b11cda5c84df Mon Sep 17 00:00:00 2001 From 05de88f9fe2415664adff793351f916cc6a01485 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Sep 2014 10:50:27 +0100 Date: Tue, 30 Sep 2014 10:50:27 +0100
Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313). Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313).
@ -42,7 +42,7 @@ index a5f155cb..3a2e6238 100644
=item B<-o json -os> C<DIRECTORY> =item B<-o json -os> C<DIRECTORY>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 9323ff52..06ddd781 100644 index fb8b6a5d..924e1d2d 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -144,11 +144,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk @@ -144,11 +144,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk

View File

@ -1,4 +1,4 @@
From e51db3fdf2b3abde05235f6c14c396eae0048320 Mon Sep 17 00:00:00 2001 From f3c0c18b122b55e3f94b3bb757addaf18c2c5b6f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Apr 2015 09:45:41 -0400 Date: Fri, 24 Apr 2015 09:45:41 -0400
Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL

View File

@ -1,14 +1,27 @@
From 709e21ab98a6d207301161e6463dab8a77c87749 Mon Sep 17 00:00:00 2001 From 2a4386e45aa52ebfdd501a8189458e2a6bad4708 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 30 Aug 2015 03:21:57 -0400 Date: Sun, 30 Aug 2015 03:21:57 -0400
Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport. Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport.
It doesn't let us use guestfish for arbitrary Windows edits. It doesn't let us use guestfish for arbitrary Windows edits.
--- ---
tests/test-v2v-virtio-win-iso.sh | 8 +++++++- test-data/phony-guests/make-windows-img.sh | 1 +
tests/test-v2v-windows-conversion.sh | 8 +++++++- tests/test-v2v-virtio-win-iso.sh | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-) tests/test-v2v-windows-conversion.sh | 8 +++++++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
index 30908a91..73cf5144 100755
--- a/test-data/phony-guests/make-windows-img.sh
+++ b/test-data/phony-guests/make-windows-img.sh
@@ -37,6 +37,7 @@ fi
# Create a disk image.
guestfish <<EOF
+set-program virt-testing
sparse windows.img-t 512M
run
diff --git a/tests/test-v2v-virtio-win-iso.sh b/tests/test-v2v-virtio-win-iso.sh diff --git a/tests/test-v2v-virtio-win-iso.sh b/tests/test-v2v-virtio-win-iso.sh
index 6e99f0f1..a8e572c5 100755 index 6e99f0f1..a8e572c5 100755
--- a/tests/test-v2v-virtio-win-iso.sh --- a/tests/test-v2v-virtio-win-iso.sh

View File

@ -1,4 +1,4 @@
From 4773fdcb0be3517e658c8bf08ed65537851e43dc Mon Sep 17 00:00:00 2001 From 1d74df726204bb9c6220ccd0505c8b63db10f833 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 14 Jan 2016 11:53:42 -0500 Date: Thu, 14 Jan 2016 11:53:42 -0500
Subject: [PATCH 5/9] RHEL: v2v: Disable the virt-v2v --in-place option. Subject: [PATCH 5/9] RHEL: v2v: Disable the virt-v2v --in-place option.
@ -28,7 +28,7 @@ index dd2b1233..8fef46cc 100755
--ip,\ --ip,\
--it,\ --it,\
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 06ddd781..50b0bc8e 100644 index 924e1d2d..4016c724 100644
--- a/docs/virt-v2v.pod --- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod
@@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM @@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM
@ -73,7 +73,7 @@ index 06ddd781..50b0bc8e 100644
=item B<-io> OPTION=VALUE =item B<-io> OPTION=VALUE
Set input option(s) related to the current input mode or transport. Set input option(s) related to the current input mode or transport.
@@ -1332,8 +1311,8 @@ have at least 100 available inodes. @@ -1338,8 +1317,8 @@ have at least 100 available inodes.
=head3 Minimum free space check in the host =head3 Minimum free space check in the host
You must have sufficient free space in the host directory used to You must have sufficient free space in the host directory used to
@ -84,7 +84,7 @@ index 06ddd781..50b0bc8e 100644
$ df -h "`guestfish get-cachedir`" $ df -h "`guestfish get-cachedir`"
Filesystem Size Used Avail Use% Mounted on Filesystem Size Used Avail Use% Mounted on
@@ -1471,31 +1450,6 @@ that instead. @@ -1477,31 +1456,6 @@ that instead.
</devices> </devices>
</domain> </domain>

View File

@ -1,4 +1,4 @@
From a128631fded7e2c4e45fcf4304945ca430296944 Mon Sep 17 00:00:00 2001 From bf5b711b261a6a577a441235db68ad58b20711bd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Mar 2017 14:21:37 +0100 Date: Thu, 2 Mar 2017 14:21:37 +0100
Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)

View File

@ -1,4 +1,4 @@
From c72bbcd9b22408023c686e64040db2693dd70467 Mon Sep 17 00:00:00 2001 From d3eece67059c836c88f6001a5a928a3063a1aaa2 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Mar 2017 11:03:40 +0100 Date: Wed, 8 Mar 2017 11:03:40 +0100
Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

View File

@ -1,4 +1,4 @@
From 4663022f13c209260341b4586ef8787cfe158ea5 Mon Sep 17 00:00:00 2001 From fba7d8bf5dad6fce2a0122570f6b69e0db9ce697 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 14 May 2018 10:16:58 +0100 Date: Mon, 14 May 2018 10:16:58 +0100
Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse. Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse.

View File

@ -1,4 +1,4 @@
From 3fcf10ae7beaaf2de969b732afb35c9a5c36f52b Mon Sep 17 00:00:00 2001 From b003d781dacf76572e11fad17ea699a99a324f54 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 26 Mar 2019 09:42:25 +0100 Date: Tue, 26 Mar 2019 09:42:25 +0100
Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests