b6cf325d1f
resolves: rhbz#2102719 Add -oo compressed support resolves: rhbz#2047660 Install qemu-ga package during conversion (2028764) Limit the maximum of disks per guest resolves: rhbz#2051564 Add support for LUKS encrypted guests using Clevis & Tang resolves: rhbz#1809453
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 55ae823b5a98667483ef6c9bf1f70011f2f60268 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Tue, 14 Jun 2022 13:27:07 +0200
|
|
Subject: [PATCH] test-data: Replace deprecated luks_open with cryptsetup_open.
|
|
|
|
The two calls are identical, so this simply avoids a deprecation
|
|
warning.
|
|
|
|
(Picked from guestfs-tools commit 9a27f19269f5 ("test-data: Replace
|
|
deprecated luks_open with cryptsetup_open.", 2022-02-28).)
|
|
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20220614112709.12210-2-lersek@redhat.com>
|
|
Acked-by: Richard W.M. Jones <rjones@redhat.com>
|
|
(cherry picked from commit 88e237da4c4d065e445659e2fdf34892cb99bdb9)
|
|
---
|
|
test-data/phony-guests/make-fedora-img.pl | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
|
|
index ad30960f..488a7d89 100755
|
|
--- a/test-data/phony-guests/make-fedora-img.pl
|
|
+++ b/test-data/phony-guests/make-fedora-img.pl
|
|
@@ -195,7 +195,7 @@ EOF
|
|
|
|
# Put LUKS on the second partition.
|
|
$g->luks_format ('/dev/sda2', 'FEDORA', 0);
|
|
- $g->luks_open ('/dev/sda2', 'FEDORA', 'luks');
|
|
+ $g->cryptsetup_open ('/dev/sda2', 'FEDORA', 'luks');
|
|
|
|
init_lvm_root ('/dev/mapper/luks');
|
|
}
|
|
--
|
|
2.31.1
|
|
|