--- common | 2 +- inspector/test-virt-inspector-luks-on-lvm.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common b/common index 6185aa84..9e988f21 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6185aa8431b00ea3669e9e81e75233f4e865f828 +Subproject commit 9e988f21cb9ff6ace379e89ffd95ac09df8969fb diff --git a/inspector/test-virt-inspector-luks-on-lvm.sh b/inspector/test-virt-inspector-luks-on-lvm.sh index 13b25e33..349e3ed9 100755 --- a/inspector/test-virt-inspector-luks-on-lvm.sh +++ b/inspector/test-virt-inspector-luks-on-lvm.sh @@ -36,6 +36,7 @@ if [ "$(guestfish version | grep minor | awk '{print $2}')" -lt 47 ]; then fi f=../test-data/phony-guests/fedora-luks-on-lvm.img + keys=(--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 @@ -46,6 +47,11 @@ keys_mapper=(--key /dev/mapper/Volume--Group-Root:key:FEDORA-Root --key /dev/mapper/Volume--Group-Logical--Volume--2:key:FEDORA-LV2 --key /dev/mapper/Volume--Group-Logical--Volume--3:key:FEDORA-LV3) +keys_all=(--key all:key:FEDORA-Root + --key all:key:FEDORA-LV1 + --key all:key:FEDORA-LV2 + --key all:key:FEDORA-LV3) + # Ignore zero-sized file. if [ -s "$f" ]; then uuid_root=$(guestfish --ro -i -a "$f" "${keys[@]}" \ @@ -64,4 +70,8 @@ if [ -s "$f" ]; then # virt-inspector invocation (which used the /dev/VG/LV format). $VG virt-inspector "${keys_mapper[@]}" --format=raw -a "$f" \ | diff -u "actual-$b.xml" - + + # Re-run using all:SELECTOR syntax. + $VG virt-inspector "${keys_all[@]}" --format=raw -a "$f" \ + | diff -u "actual-$b.xml" - fi