From 06464f7cfc8774dc037c129730e693480a29534f Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sun, 3 Sep 2023 22:00:30 +0200 Subject: [PATCH] tests: vdo wrapper support symlinks Enhance internal VDO replacement wrapper script to handle symlinks for i.e. SCSI device like VDO manager. --- test/lib/lvm_vdo_wrapper.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/lib/lvm_vdo_wrapper.sh b/test/lib/lvm_vdo_wrapper.sh index 83332561a..69d87f9a9 100755 --- a/test/lib/lvm_vdo_wrapper.sh +++ b/test/lib/lvm_vdo_wrapper.sh @@ -159,6 +159,14 @@ cachesize=$(( cachesize / 4 )) # 4KiB units maxdiscardsize=$(vdo_get_kb_size_with_unit_ "$vdo_maxDiscardSize" M) maxdiscardsize=$(( maxdiscardsize / 4 )) # 4KiB units +vdo_link=$(udevadm info --no-pager --query=symlink --name="$vdo_device" 2>/dev/null) +vdo_link=${vdo_link%% *} +if test -n "$vdo_link" ; then + vdo_link="/dev/$vdo_link" +else + vdo_link=$vdo_device +fi + test -e "$vdo_confFile" || { cat > "$vdo_confFile" <> "$vdo_confFile" </dev/null || return 0 +test -z "$vdo_verbose" || vdo_dry_ dmsetup status --target vdo "$vdo_name" 2>/dev/null || return 0 vdo_dry_ dmsetup remove $vdo_force "$vdo_name" || true }