]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: fix TEST-02-CRYPTSETUP on Debian/Ubuntu
authorEvgeny Vereshchagin <evvers@ya.ru>
Sun, 17 Jan 2016 03:32:37 +0000 (03:32 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Mon, 18 Jan 2016 03:56:51 +0000 (03:56 +0000)
test/test-functions

index d6be7f867dc3e5478e474719f67e3df006bf4673..55d43134ea7be0e6c6604e4a8a22c0b47d06558c 100644 (file)
@@ -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() {