diff --git a/0030-convert-linux-properly-match-etc-crypttab.patch b/0030-convert-linux-properly-match-etc-crypttab.patch new file mode 100644 index 0000000..3176b0c --- /dev/null +++ b/0030-convert-linux-properly-match-etc-crypttab.patch @@ -0,0 +1,33 @@ +From 4e06515083d7effdee91195dbf93082e544a6283 Mon Sep 17 00:00:00 2001 +Message-ID: <4e06515083d7effdee91195dbf93082e544a6283.1771345004.git.crobinso@redhat.com> +In-Reply-To: <859c43b1eb81cfdcb5f481b571e2c387860f8a27.1771345004.git.crobinso@redhat.com> +References: <859c43b1eb81cfdcb5f481b571e2c387860f8a27.1771345004.git.crobinso@redhat.com> +From: Cole Robinson +Date: Mon, 16 Feb 2026 13:58:08 -0500 +Subject: [PATCH] convert: linux: properly match /etc/crypttab + +I broke b227d493ace2250bbc53a25ce7db42fcf220ba51 during review +and neglected to retest. We need to match an augeas style +path when using starts_with + +Fixes: https://issues.redhat.com/browse/RHEL-93583 + +Signed-off-by: Cole Robinson +(cherry picked from commit 109bc1ab3bd2f6b9d73616c546aeceb0631159be) +--- + convert/convert_linux.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml +index 4462e6cf..484148ab 100644 +--- a/convert/convert_linux.ml ++++ b/convert/convert_linux.ml +@@ -1212,7 +1212,7 @@ fi + This depends on /dev/sdXX in the guest having the same /dev/sdXX + name in the appliance. + *) +- if String.starts_with "/etc/crypttab" path && ++ if String.starts_with "/files/etc/crypttab" path && + String.starts_with "/dev/sd" value then ( + try + let uuid = g#vfs_uuid value in diff --git a/virt-v2v.spec b/virt-v2v.spec index a82ac44..eccdc7a 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -45,7 +45,7 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 Version: 2.10.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -94,6 +94,7 @@ Patch0026: 0026-RHEL-tests-Remove-btrfs-test.patch Patch0027: 0027-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch Patch0028: 0028-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch Patch0029: 0029-Update-common-submodule.patch +Patch0030: 0030-convert-linux-properly-match-etc-crypttab.patch BuildRequires: autoconf, automake, libtool BuildRequires: make @@ -398,6 +399,10 @@ done %changelog +* Tue Feb 17 2026 Cole Robinson - 2.10.0-7 +- Attempt 2 to fix sles12sp5 crypttab + resolves: RHEL-93583 + * Thu Feb 12 2026 Cole Robinson - 1:2.10.0-6 - Install blnsvr.exe to \Windows\Drivers\VirtIO resolves: RHEL-148423