From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 14 Feb 2018 20:34:55 +0000 (+0000)
Subject: test/test-functions: Debian/Ubuntu, now ship 95-dm-notify.rules, copy it
X-Git-Tag: v238~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c869ff6bf9a1dba8888e70f734fccbab9621a87;p=thirdparty%2Fsystemd.git

test/test-functions: Debian/Ubuntu, now ship 95-dm-notify.rules, copy it

This fixes cryptsetup tests on recent Ubuntu/Debian systems (current
development series).

Bug-Launchpad: https://launchpad.net/bugs/1749432
---

diff --git a/test/test-functions b/test/test-functions
index 018bdca8884..75796a09add 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -313,8 +313,9 @@ install_dmevent() {
     inst_libdir_file "libdevmapper-event.so*"
     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
+        # and since buster/bionic 95-dm-notify.rules
+        # see https://gitlab.com/debian-lvm/lvm2/blob/master/debian/patches/udev.patch
+        inst_rules 55-dm.rules 60-persistent-storage-dm.rules 95-dm-notify.rules
     else
         inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
     fi