test: install correct kpartx udev rules on Debian

Resolves: #30703
(cherry picked from commit 519f0074cf87391b17a82ea983daed6183d62fb6)

Gbp-Pq: Name test-install-correct-kpartx-udev-rules-on-Debian.patch

diff --git a/test/test-functions b/test/test-functions
index f887346b34b2f2e4f0112eca326bf8b1eef73bc6..2c79a66ae870fabc6f03ca69a14526f433d3fba1 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1151,7 +1151,9 @@ install_multipath() {
     image_install kpartx /lib/udev/kpartx_id lsmod mpathpersist multipath multipathd partx
     image_install "${ROOTLIBDIR:?}"/system/multipathd.{service,socket}
     if get_bool "$LOOKS_LIKE_DEBIAN"; then
-        inst_rules 56-dm-parts.rules 56-dm-mpath.rules 60-multipath.rules 68-del-part-nodes.rules 95-kpartx.rules
+        # Note: try both 60-kpartx.rules (as seen on Debian Sid with 0.9.4-7) and 90-kpartx.rules (as seen on
+        # Ubuntu Jammy with 0.8.8-1ubuntu1.22.04.4)
+        inst_rules 56-dm-parts.rules 56-dm-mpath.rules 60-kpartx.rules 60-multipath.rules 68-del-part-nodes.rules 90-kpartx.rules
     else
         inst_rules 11-dm-mpath.rules 11-dm-parts.rules 62-multipath.rules 66-kpartx.rules 68-del-part-nodes.rules
     fi