[Libguestfs] [guestfs-tools PATCH 2/3] inspector: rename "luks" to "lvm-on-luks"
Laszlo Ersek
lersek at redhat.com
Wed Feb 23 16:22:14 UTC 2022
Clarify that our current usage of "luks" stands for "lvm-on-luks" (IOW,
that the decrypted LUKS devices are Physical Volumes for LVM).
(This is a port of libguestfs patch 'tests: rename "luks" to
"lvm-on-luks"'.)
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1658126
Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
inspector/Makefile.am | 8 ++++----
test-data/phony-guests/Makefile.am | 8 ++++----
.gitignore | 2 +-
inspector/{expected-fedora-luks.img.xml => expected-fedora-lvm-on-luks.img.xml} | 0
inspector/{test-virt-inspector-luks.sh => test-virt-inspector-lvm-on-luks.sh} | 2 +-
test-data/phony-guests/guests.xml.in | 4 ++--
test-data/phony-guests/make-fedora-img.pl | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 3c7cc17c98e3..961498e81788 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -27,13 +27,13 @@ example_xml = \
EXTRA_DIST = \
expected-debian.img.xml \
expected-fedora.img.xml \
- expected-fedora-luks.img.xml \
+ expected-fedora-lvm-on-luks.img.xml \
expected-ubuntu.img.xml \
expected-archlinux.img.xml \
expected-coreos.img.xml \
expected-windows.img.xml \
test-virt-inspector.sh \
- test-virt-inspector-luks.sh \
+ test-virt-inspector-lvm-on-luks.sh \
test-virt-inspector-docs.sh \
test-xmllint.sh \
virt-inspector.pod
@@ -95,14 +95,14 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
TESTS = \
test-virt-inspector-docs.sh \
test-virt-inspector.sh \
- test-virt-inspector-luks.sh
+ test-virt-inspector-lvm-on-luks.sh
if HAVE_XMLLINT
TESTS += test-xmllint.sh
endif
check-valgrind:
- $(MAKE) TESTS="test-virt-inspector.sh test-virt-inspector-luks.sh" VG="@VG@" check
+ $(MAKE) TESTS="test-virt-inspector.sh test-virt-inspector-lvm-on-luks.sh" VG="@VG@" check
check-valgrind-local-guests:
for g in $(GUESTS); do \
diff --git a/test-data/phony-guests/Makefile.am b/test-data/phony-guests/Makefile.am
index 60313548af32..0114d10bb170 100644
--- a/test-data/phony-guests/Makefile.am
+++ b/test-data/phony-guests/Makefile.am
@@ -49,7 +49,7 @@ disk_images = \
fedora-md1.img \
fedora-md2.img \
fedora-btrfs.img \
- fedora-luks.img \
+ fedora-lvm-on-luks.img \
ubuntu.img \
archlinux.img \
coreos.img \
@@ -96,11 +96,11 @@ fedora-btrfs.img: make-fedora-img.pl \
fedora.db
SRCDIR=$(srcdir) LAYOUT=btrfs $(top_builddir)/run --test ./$<
-# Make a (dummy) Fedora image with LVM encrypted with LUKS.
-fedora-luks.img: make-fedora-img.pl \
+# Make a (dummy) Fedora image with LVM-on-LUKS.
+fedora-lvm-on-luks.img: make-fedora-img.pl \
fedora-journal.tar.xz \
fedora.db
- SRCDIR=$(srcdir) LAYOUT=lvm-luks $(top_builddir)/run --test ./$<
+ SRCDIR=$(srcdir) LAYOUT=lvm-on-luks $(top_builddir)/run --test ./$<
# Make a (dummy) Debian image.
debian.img: make-debian-img.sh
diff --git a/.gitignore b/.gitignore
index 6bc509faba32..5489c0cd2a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,7 +151,7 @@ Makefile.in
/test-data/phony-guests/debian.img
/test-data/phony-guests/fedora.img
/test-data/phony-guests/fedora-btrfs.img
-/test-data/phony-guests/fedora-luks.img
+/test-data/phony-guests/fedora-lvm-on-luks.img
/test-data/phony-guests/fedora-md1.img
/test-data/phony-guests/fedora-md2.img
/test-data/phony-guests/fedora.db
diff --git a/inspector/expected-fedora-luks.img.xml b/inspector/expected-fedora-lvm-on-luks.img.xml
similarity index 100%
rename from inspector/expected-fedora-luks.img.xml
rename to inspector/expected-fedora-lvm-on-luks.img.xml
diff --git a/inspector/test-virt-inspector-luks.sh b/inspector/test-virt-inspector-lvm-on-luks.sh
similarity index 96%
rename from inspector/test-virt-inspector-luks.sh
rename to inspector/test-virt-inspector-lvm-on-luks.sh
index 79adb1a9619f..955ac6316946 100755
--- a/inspector/test-virt-inspector-luks.sh
+++ b/inspector/test-virt-inspector-lvm-on-luks.sh
@@ -27,7 +27,7 @@ set -x
$TEST_FUNCTIONS
skip_if_skipped
-f=../test-data/phony-guests/fedora-luks.img
+f=../test-data/phony-guests/fedora-lvm-on-luks.img
# Ignore zero-sized file.
if [ -s "$f" ]; then
diff --git a/test-data/phony-guests/guests.xml.in b/test-data/phony-guests/guests.xml.in
index 4139d04f689f..3af6b27af073 100644
--- a/test-data/phony-guests/guests.xml.in
+++ b/test-data/phony-guests/guests.xml.in
@@ -185,7 +185,7 @@
<!-- LUKS password is 'FEDORA' -->
<domain type='test'>
- <name>fedora-luks</name>
+ <name>fedora-lvm-on-luks</name>
<memory>1048576</memory>
<os>
<type>hvm</type>
@@ -194,7 +194,7 @@
<devices>
<disk type='file' device='disk'>
<driver name='qemu' type='raw'/>
- <source file='@abs_builddir@/fedora-luks.img'/>
+ <source file='@abs_builddir@/fedora-lvm-on-luks.img'/>
<target dev='vda' bus='virtio'/>
</disk>
</devices>
diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
index 27b154f9d71d..4cd6ef9575eb 100755
--- a/test-data/phony-guests/make-fedora-img.pl
+++ b/test-data/phony-guests/make-fedora-img.pl
@@ -171,8 +171,8 @@ EOF
}
}
-elsif ($ENV{LAYOUT} eq 'lvm-luks') {
- push (@images, "fedora-luks.img-t");
+elsif ($ENV{LAYOUT} eq 'lvm-on-luks') {
+ push (@images, "fedora-lvm-on-luks.img-t");
open (my $fstab, '>', "fedora.fstab") or die;
print $fstab <<EOF;
@@ -183,9 +183,9 @@ EOF
$bootdev = '/dev/sda1';
- $g->disk_create ("fedora-luks.img-t", "raw", $IMAGE_SIZE);
+ $g->disk_create ("fedora-lvm-on-luks.img-t", "raw", $IMAGE_SIZE);
- $g->add_drive ("fedora-luks.img-t", format => "raw");
+ $g->add_drive ("fedora-lvm-on-luks.img-t", format => "raw");
$g->launch ();
$g->part_init ('/dev/sda', 'mbr');
--
2.19.1.3.g30247aa5d201
More information about the Libguestfs
mailing list