On Thu, Jun 09, 2022 at 11:58:32AM +0200, Laszlo Ersek wrote:
On 06/09/22 10:46, Richard W.M. Jones wrote:
> On Thu, Jun 09, 2022 at 10:25:08AM +0200, Laszlo Ersek wrote:
>> On 06/09/22 10:11, Richard W.M. Jones wrote:
>>> On Thu, Jun 09, 2022 at 10:02:54AM +0200, Laszlo Ersek wrote:
>>>> On 06/08/22 18:48, Richard W.M. Jones wrote:
>>>>> When we split virt-v2v from libguestfs many moons ago, I copied the
>>>>> test-data/ subdirectory over. I didn't modify it much, and it
>>>>> contains much test data that is irrelevant to virt-v2v. (This
change
>>>>> does _not_ clean up any of that ...) However we did use the phony
>>>>> Windows image (test-data/phony-guests/windows.img) to do a
semblance
>>>>> of testing Windows conversions, or as much as can be done without
>>>>> having the proprietary operating system itself around.
>>>>>
>>>>> We never used any of the Linux images, and in fact (before this
>>>>> change) they could not be used.
>>>>
>>>> Ah, indeed; for the LUKS-on-LV stuff, I synched
>>>> "test-data/phony-guests/make-fedora-img.pl" from libguestfs
and
>>>> guestfs-tools (commits 8f2bbc3d50d8 and 27da4b0c4991), but didn't
touch
>>>> virt-v2v's copy. There was no need, and even prior differences
existed.
>>>>
>>>> ... Indeed, libguestfs commit 0b223a287711 ("test-data: Replace
>>>> deprecated luks_open with cryptsetup_open.", 2021-05-27) had not
been
>>>> ported to virt-v2v's copy.
>>>
>>> It probably makes sense to backport these commits if they apply
>>> easily. Can you do that? I don't think they will conflict with this
>>> series, but would allow us to test the luks-on-lv case additionally.
>>
>> I'm marking this for later in my mailbox.
>
> OK I won't push anything for now.
I think your series can go in first; I don't expect conflicts due to
your series. I do expect some navel gazing on my part for the backport
(or forward port) per se, though... :)
OK, I pushed my series as:
0d1b2ec1b7..3600f81ec5 master -> master
But I forgot to add the acked/reviewed tags :-(
Thanks!
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html