From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 3 Jan 2024 16:24:03 +0000 (+0100)
Subject: test: install correct kpartx udev rules on Debian
X-Git-Tag: v256-rc1~1325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=519f0074cf;p=thirdparty%2Fsystemd.git

test: install correct kpartx udev rules on Debian

Resolves: #30703
---

diff --git a/test/test-functions b/test/test-functions
index 77da9259d73..86a76a8d469 100644
--- 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