From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sun, 17 Jan 2016 03:32:37 +0000 (+0000)
Subject: tests: fix TEST-02-CRYPTSETUP on Debian/Ubuntu
X-Git-Tag: v229~133^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac289ce3f5eb3f13806f7c631c6b23cee18b26da;p=thirdparty%2Fsystemd.git

tests: fix TEST-02-CRYPTSETUP on Debian/Ubuntu
---

diff --git a/test/test-functions b/test/test-functions
index d6be7f867dc..55d43134ea7 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -159,7 +159,13 @@ install_dmevent() {
     instmods dm_crypt =crypto
     type -P dmeventd >/dev/null && dracut_install dmeventd
     inst_libdir_file "libdevmapper-event.so*"
-    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
+    if [[ "$LOOKS_LIKE_DEBIAN" ]]; then
+        # dmsetup installs 55-dm and 60-persistent-storage-dm on Debian/Ubuntu
+        # see https://anonscm.debian.org/cgit/pkg-lvm/lvm2.git/tree/debian/patches/0007-udev.patch
+        inst_rules 55-dm.rules 60-persistent-storage-dm.rules
+    else
+        inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
+    fi
 }
 
 install_systemd() {