552929e8d3
(1) Backport the upstream patches for recognizing the command line option
--key /dev/mapper/VG-LV🔑password
Similarly to the backports for guestfs-tools BZ#2209280 and libguestfs
BZ#2209279, here we need to update the common submodule (thankfully we
need not excise any hunks -- we had to do that for libguestfs).
Unlike those "single-step" submodule updates however, for virt-v2v we
bridge the same submodule commit range 70c10a079a30..b636c3f20a1b in
two steps, stopping at commit 38e6988c1864 in the middle. We do that
simply because that's how upstream virt-v2v moved; i.e., there are two
upstream patches to cherry-pick for advancing our submodule reference.
(2) In dist-git commit ef9a918d7e, there was a typo: the "test" command
was left out. Therefore even our simple test conversion has not been
invoked -- see e.g.
<https://download.eng.bos.redhat.com/brewroot/vol/rhel-9/packages/virt-v2v/2.3.4/2.el9/data/logs/x86_64/build.log>:
> + -s test-data/phony-guests/windows.img
> /var/tmp/rpm-tmp.UMecKA: line 48: -s: command not found
Unfortunately, incorrectly (not) invoking "test -s" has had results
identical to invoking "test -s" correctly and "test -s" failing;
therefore we've been just silently skipping our simple conversion,
assuming "no non-empty guest disk images".
Fix this typo...
(3) ... and then run the sole "test-v2v-fedora-luks-on-lvm-conversion.sh"
test from the test suite, for verifying the backport in the build
environment. (The idea for the future is that we'd run such individual
tests whenever backporting patches.) For this, we also start depending
(at build time) on the sqlite3 command.
resolves: rhbz#2168506
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
From c8902c551014bc0163122d9fd2005d97d3cb38a5 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Mon, 15 May 2023 19:55:29 +0200
|
|
Subject: [PATCH] LUKS-on-LVM conversion test: test /dev/mapper/VG-LV
|
|
translation
|
|
|
|
In the LUKS-on-LVM conversion test, repeat the null conversion with such
|
|
"--key" options that exercise the recent "/dev/mapper/VG-LV" ->
|
|
"/dev/VG/LV" translation (unescaping) from libguestfs-common.
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168506
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20230515175529.290724-3-lersek@redhat.com>
|
|
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
|
(cherry picked from commit 3060af01e87fbffe1cb413938c3c5431f2242bd4)
|
|
---
|
|
tests/test-v2v-fedora-luks-on-lvm-conversion.sh | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/tests/test-v2v-fedora-luks-on-lvm-conversion.sh b/tests/test-v2v-fedora-luks-on-lvm-conversion.sh
|
|
index 7ad17e0d..605b19fb 100755
|
|
--- a/tests/test-v2v-fedora-luks-on-lvm-conversion.sh
|
|
+++ b/tests/test-v2v-fedora-luks-on-lvm-conversion.sh
|
|
@@ -34,3 +34,10 @@ keys=(--key /dev/Volume-Group/Root:key:FEDORA-Root
|
|
--key /dev/Volume-Group/Logical-Volume-3:key:FEDORA-LV3)
|
|
|
|
$VG virt-v2v --debug-gc -i disk $f -o null "${keys[@]}"
|
|
+
|
|
+keys=(--key /dev/mapper/Volume--Group-Root:key:FEDORA-Root
|
|
+ --key /dev/mapper/Volume--Group-Logical--Volume--1:key:FEDORA-LV1
|
|
+ --key /dev/mapper/Volume--Group-Logical--Volume--2:key:FEDORA-LV2
|
|
+ --key /dev/mapper/Volume--Group-Logical--Volume--3:key:FEDORA-LV3)
|
|
+
|
|
+$VG virt-v2v --debug-gc -i disk $f -o null "${keys[@]}"
|