commit d0bfb187748b14b00924a93601413e92ad244d90 parent bd1590c982d967891b5680cb8b74002a17f1a342 Author: John Unland <unlandj2012@gmail.com> Date: Mon, 20 Feb 2023 19:01:16 +0000 Allow placing of partition suffix on WWID devices Diffstat:
| M | persistent-storage | | | 2 | +- |
| M | tests/persistent-storage_test | | | 24 | ++++++++++++++++++++++++ |
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/persistent-storage b/persistent-storage @@ -73,7 +73,7 @@ if [ -n "$wwid" ]; then nvme*) symlink_action ../../$MDEV disk/by-id/nvme-${wwid}${partsuffix};; esac case "$wwid" in - naa.*) symlink_action ../../$MDEV disk/by-id/wwn-0x${wwid#naa.};; + naa.*) symlink_action ../../$MDEV disk/by-id/wwn-0x${wwid#naa.}${partsuffix};; esac fi diff --git a/tests/persistent-storage_test b/tests/persistent-storage_test @@ -5,6 +5,7 @@ init_tests \ persistent_storage_cdrom \ persistent_storage_nvme_wwid \ persistent_storage_sda_wwid \ + persistent_storage_sda_wwid_partition_symlink \ persistent_storage_nvme_model_serial \ persistent_storage_virtio_serial \ persistent_storage_block \ @@ -65,6 +66,29 @@ persistent_storage_sda_wwid_body() { readlink disk/by-id/wwn-0x5002538f4158fd7b } +persistent_storage_sda_wwid_partition_symlink_body() { + mkdir -p sys/class/block + mkdir -p sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda1 + ln -s ../../devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda1 sys/class/block/sda1 + + mkdir -p sys/class/block/sda/device + echo naa.5000cca03e99fea4 > sys/class/block/sda/device/wwid + + mkdir -p sys/class/block/sda1 + echo '1' > sys/class/block/sda1/partition + + MDEV=sda1 ACTION=add atf_check \ + sh $mdevscript + atf_check -o match:"sda1" \ + readlink disk/by-id/wwn-0x5000cca03e99fea4-part1 + + MDEV=sda1 ACTION=remove atf_check \ + sh $mdevscript + atf_check -s not-exit:0 \ + readlink disk/by-id/wwn-0x5000cca03e99fea4-part1 +} + + persistent_storage_nvme_model_serial_body() { mkdir -p sys/class/block/nvme0n1/device echo 'Samsung SSD 960 EVO 500GB ' > sys/class/block/nvme0n1/device/model