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

LUKS-on-LVM inspection test: rename VGs and LVs

Browse Source 
In preparation for a subsequent patch, rename "VG" to "Volume-Group", and
"LV<n>" to "Logical-Volume-<n>", in the LUKS-on-LVM inspection test.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168506
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20230519140849.310774-3-lersek@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
(cherry picked from commit 58e2640233)
This commit is contained in:
Laszlo Ersek
2023-05-19 16:08:48 +02:00
committed by Richard W.M. Jones
parent d9ba056079
commit 826cf6d68e
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,23 +224,27 @@ EOF
# Create the Volume Group on /dev/sda2.
$g->pvcreate ('/dev/sda2');
$g->vgcreate ('VG', ['/dev/sda2']);
$g->lvcreate ('Root', 'VG', 32);
$g->lvcreate ('LV1', 'VG', 32);
$g->lvcreate ('LV2', 'VG', 32);
$g->lvcreate ('LV3', 'VG', 64);
$g->vgcreate ('Volume-Group', ['/dev/sda2']);
$g->lvcreate ('Root', 'Volume-Group', 32);
$g->lvcreate ('Logical-Volume-1', 'Volume-Group', 32);
$g->lvcreate ('Logical-Volume-2', 'Volume-Group', 32);
$g->lvcreate ('Logical-Volume-3', 'Volume-Group', 64);
# Format each Logical Group as a LUKS device, with a different password.
$g->luks_format ('/dev/VG/Root', 'FEDORA-Root', 0);
$g->luks_format ('/dev/VG/LV1', 'FEDORA-LV1', 0);
$g->luks_format ('/dev/VG/LV2', 'FEDORA-LV2', 0);
$g->luks_format ('/dev/VG/LV3', 'FEDORA-LV3', 0);
$g->luks_format ('/dev/Volume-Group/Root', 'FEDORA-Root', 0);
$g->luks_format ('/dev/Volume-Group/Logical-Volume-1', 'FEDORA-LV1', 0);
$g->luks_format ('/dev/Volume-Group/Logical-Volume-2', 'FEDORA-LV2', 0);
$g->luks_format ('/dev/Volume-Group/Logical-Volume-3', 'FEDORA-LV3', 0);
# Open the LUKS devices. This creates nodes like /dev/mapper/*-luks.
$g->cryptsetup_open ('/dev/VG/Root', 'FEDORA-Root', 'Root-luks');
$g->cryptsetup_open ('/dev/VG/LV1', 'FEDORA-LV1', 'LV1-luks');
$g->cryptsetup_open ('/dev/VG/LV2', 'FEDORA-LV2', 'LV2-luks');
$g->cryptsetup_open ('/dev/VG/LV3', 'FEDORA-LV3', 'LV3-luks');
$g->cryptsetup_open ('/dev/Volume-Group/Root',
'FEDORA-Root', 'Root-luks');
$g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-1',
'FEDORA-LV1', 'LV1-luks');
$g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-2',
'FEDORA-LV2', 'LV2-luks');
$g->cryptsetup_open ('/dev/Volume-Group/Logical-Volume-3',
'FEDORA-LV3', 'LV3-luks');
# Phony root filesystem.
$g->mkfs ('ext2', '/dev/mapper/Root-luks', blocksize => 4096, label => 'ROOT');

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

@@ -30,10 +30,10 @@ skip_unless_phony_guest fedora-luks-on-lvm.img
# Volume names.
guestfish=(guestfish --listen --ro --inspector
--add ../test-data/phony-guests/fedora-luks-on-lvm.img)
keys_by_lvname=(--key /dev/VG/Root:key:FEDORA-Root
--key /dev/VG/LV1:key:FEDORA-LV1
--key /dev/VG/LV2:key:FEDORA-LV2
--key /dev/VG/LV3:key:FEDORA-LV3)
keys_by_lvname=(--key /dev/Volume-Group/Root:key:FEDORA-Root
--key /dev/Volume-Group/Logical-Volume-1:key:FEDORA-LV1
--key /dev/Volume-Group/Logical-Volume-2:key:FEDORA-LV2
--key /dev/Volume-Group/Logical-Volume-3:key:FEDORA-LV3)
# The variable assignment below will fail, and abort the script, if guestfish
# refuses to start up.
@@ -56,10 +56,10 @@ function cleanup_guestfish
trap cleanup_guestfish EXIT
# Get the UUIDs of the LUKS devices.
uuid_root=$(guestfish --remote -- luks-uuid /dev/VG/Root)
uuid_lv1=$( guestfish --remote -- luks-uuid /dev/VG/LV1)
uuid_lv2=$( guestfish --remote -- luks-uuid /dev/VG/LV2)
uuid_lv3=$( guestfish --remote -- luks-uuid /dev/VG/LV3)
uuid_root=$(guestfish --remote -- luks-uuid /dev/Volume-Group/Root)
uuid_lv1=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-1)
uuid_lv2=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-2)
uuid_lv3=$( guestfish --remote -- luks-uuid /dev/Volume-Group/Logical-Volume-3)
# The actual test.
function check_filesystems