mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: rename "luks" to "lvm-on-luks"

Browse Source 
Clarify that our current usage of "luks" stands for "lvm-on-luks" (IOW,
that the decrypted LUKS devices are Physical Volumes for LVM).

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1658126
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20220223162120.16729-2-lersek@redhat.com>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Laszlo Ersek
2022-02-23 17:21:18 +01:00
parent ed7e3462a2
commit 39a5bb6fda
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -452,7 +452,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

8
test-data/phony-guests/Makefile.am
View File

@@ -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

4
test-data/phony-guests/guests.xml.in
View File

@@ -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>

8
test-data/phony-guests/make-fedora-img.pl
View File

@@ -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');

4
tests/Makefile.am
View File

@@ -464,12 +464,12 @@ TESTS += \
luks/test-luks.sh \
luks/test-luks-list.sh \
luks/test-key-option.sh \
luks/test-key-option-inspect.sh
luks/test-key-option-inspect-lvm-on-luks.sh
EXTRA_DIST += \
luks/test-luks.sh \
luks/test-luks-list.sh \
luks/test-key-option.sh \
luks/test-key-option-inspect.sh
luks/test-key-option-inspect-lvm-on-luks.sh
TESTS += \
lvm/test-lvm-filtering.sh \

4
tests/luks/test-key-option-inspect.sh → tests/luks/test-key-option-inspect-lvm-on-luks.sh
View File

@@ -24,9 +24,9 @@ set -e
$TEST_FUNCTIONS
skip_if_skipped
skip_unless_feature_available luks
skip_unless_phony_guest fedora-luks.img
skip_unless_phony_guest fedora-lvm-on-luks.img
disk=../test-data/phony-guests/fedora-luks.img
disk=../test-data/phony-guests/fedora-lvm-on-luks.img
device=/dev/sda2
# Get the UUID of the LUKS device.