Merge ~rafaeldtinoco/ubuntu/+source/multipath-tools:lp1862282-merge into ubuntu/+source/multipath-tools:debian/sid

[Rafael David Tinoco]

[Rafael David Tinoco (rafaeldtinoco)]

Please dont fully review this yet, I still have some tests to finish. Just wanted to push it here now so we dont step into each others feet for this merge. I'll provive a final comment with PPA and test results, and check if we can sync and/or drop carried patches.

[Rafael David Tinoco (rafaeldtinoco)]

Source and Binary packages seem okay for now:

(c)rafaeldtinoco@multipathtools:~/.../ubuntu$ sudo dpkg -i ./kpartx_0.8.3-1ubuntu1_amd64.deb ./kpartx-boot_0.8.3-1ubuntu1_all.deb
(Reading database ... 76654 files and directories currently installed.)
Preparing to unpack .../kpartx_0.8.3-1ubuntu1_amd64.deb ...
Unpacking kpartx (0.8.3-1ubuntu1) over (0.7.9-3ubuntu7) ...
Selecting previously unselected package kpartx-boot.
Preparing to unpack .../kpartx-boot_0.8.3-1ubuntu1_all.deb ...
Unpacking kpartx-boot (0.8.3-1ubuntu1) ...
Setting up kpartx (0.8.3-1ubuntu1) ...
Setting up kpartx-boot (0.8.3-1ubuntu1) ...
update-initramfs: deferring update (trigger activated)
Processing triggers for man-db (2.9.0-2) ...
Processing triggers for initramfs-tools (0.133ubuntu14) ...

(c)rafaeldtinoco@multipathtools:~/.../ubuntu$ sudo dpkg -i ./multipath-tools_0.8.3-1ubuntu1_amd64.deb ./multipath-tools-boot_0.8.3-1ubuntu1_all.deb
(Reading database ... 76659 files and directories currently installed.)
Preparing to unpack .../multipath-tools_0.8.3-1ubuntu1_amd64.deb ...
Unpacking multipath-tools (0.8.3-1ubuntu1) over (0.7.9-3ubuntu7) ...
Selecting previously unselected package multipath-tools-boot.
Preparing to unpack .../multipath-tools-boot_0.8.3-1ubuntu1_all.deb ...
Unpacking multipath-tools-boot (0.8.3-1ubuntu1) ...
Setting up multipath-tools (0.8.3-1ubuntu1) ...
multipathd.socket is a disabled or a static unit, not starting it.
Setting up multipath-tools-boot (0.8.3-1ubuntu1) ...
update-initramfs: deferring update (trigger activated)
Processing triggers for libc-bin (2.30-0ubuntu3) ...
Processing triggers for systemd (244.1-0ubuntu3) ...
Processing triggers for man-db (2.9.0-2) ...
Processing triggers for initramfs-tools (0.133ubuntu14) ...

[Christian Ehrhardt  (paelzer)]

Is this still "Please dont fully review this yet, I still have some tests to finish" or did the latter update made it ready for review?

[Rafael David Tinoco (rafaeldtinoco)]

I'm going to work on this today and finish my testing.

[Rafael David Tinoco (rafaeldtinoco)]

This isn't needed anymore as this was merged with Debian by Steve:

----
multipath-tools (0.8.3-1ubuntu1) focal; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
    - Fix debian/rules to not explode when building without udebs on i386.
    - Don't build the multipath-tools binary package on i386; we only want
      kpartx.
    - d/control:
      - multipath-udeb: add sg3-udeb Depends
    - d/rules: Move udev rules to priority 95, because rules that load modules
      should be >90.
    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
      that multipathd will be able to start.
    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
      - d/initramfs/kpartx.hook
      - d/kpartx-boot.postinst
      - d/kpartx-boot.postrm
      - d/control: Add kpartx-boot package for dmraid
      - d/rules: Install kpartx initramfs hook
      - d/kpartx.install: install all arch /lib* kpartx udev rules
    - patches to multipath source
      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
        files some more: since we stat() the loopback device node, we can't rely
        on S_ISREG() tests to handle this case, and should look at the device
        itself instead. (LP 1543430)
      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
        by default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
   - multipath initramfs fixes for booting from multipathed devices
      - d/initramfs/hooks: also copy wwids file on the installed system to
        ensure all paths come up on boot. (LP 1479929)
      - d/initramfs/hooks: install multipathd and required directories.
      - d/initramfs/hooks: copy multipath udev rules to initramfs
      - d/initramfs/hooks: do not copy kpartx rules to initramfs
      - d/initramfs/local-bottom: remember to stop multipathd.
      - d/initramfs/local-premount: wait for udev to settle before the call to
        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
        chance to be updated by the multipath udev rules (LP 1503286).
      - d/initramfs/local-premount: Run multipath with -B so not to assign names
        nor change /etc/multipath/bindings during initramfs (LP 1561103)
      - d/rules: install d/initramfs/local-bottom
      - d/rules: install d/initramfs/local-premount
   - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
     which is not available in the installer environment.
     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
       with CFLAGS_DISABLE_FEXCEPTIONS.
     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
       with CFLAGS_DISABLE_FEXCEPTIONS.
     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
     - init-top: take over loading...

Unmerged commits

c14d83b... by Rafael David Tinoco on 2020-02-07

update-maintainer

e298c7e... by Rafael David Tinoco on 2020-02-07

reconstruct-changelog

223b45e... by Rafael David Tinoco on 2020-02-07

merge-changelogs

6e8199a... by Rafael David Tinoco on 2020-02-07

 * Don't build the multipath-tools binary package on i386; we only
   want kpartx.

6a1032a... by Rafael David Tinoco on 2020-02-07

 * Fix debian/rules to not explode when building without udebs on i386.

1ae9948... by Rafael David Tinoco on 2020-02-07

 * Stop producing udebs on i386 where we no longer have d-i or a kernel.

02f0d4a... by Rafael David Tinoco on 2020-02-07

 * Revert "Ensure udebs have the same udev rules as installed systems
   (LP: #1825189)" for now. Udev rules get in the way at the moment.

a82b94d... by Rafael David Tinoco on 2020-02-07

 * Ensure udebs have the same udev rules as installed systems (LP: #1825189)

340d593... by Christian Ehrhardt  on 2019-04-30

UPDATE d/p/kpartx-Improve-finding-loopback-device-by-file.patch for the new upstram version

Signed-off-by: Christian Ehrhardt <email address hidden>

ba58242... by Christian Ehrhardt  on 2019-04-29

UPDATE d/p/kpartx-Improve-finding-loopback-device-by-file.patch: to match new upstream version

Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 2311cc8..005434d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,81 @@
+multipath-tools (0.8.3-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1862282). Remaining changes:
+    - debian/control: multipath-udeb: add sg3-udeb Depends
+    - debian/rules: Move udev rules to priority 95
+    - debian/multipath-tools.preinst: modprobe dm-multipath.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP #941874)
+      - debian/initramfs/kpartx.hook
+      - debian/kpartx-boot.postinst
+      - debian/kpartx-boot.postrm
+      - debian/control: Add kpartx-boot package for dmraid
+      - debian/rules: Install kpartx initramfs hook MISSING (wrong) CL:
+    - debian/kpartx.install - Was part of kpartx-boot - but really is an
+      extra fix:
+      - debian/kpartx.install: install all arch /lib* kpartx udev rules
+    - debian/initramfs/hooks: also copy wwids file on the installed system to
+      ensure all paths come up on boot. (LP #1479929)
+    - debian/initramfs/hooks: install multipathd and required directories.
+    - Remove partition device nodes of individual paths (for LVM on multipath)
+      (LP #1540401)
+      - d/initramfs/hooks: copy 56-dm-mpath-lvm rules
+      - d/initramfs/hooks: do not copy kpartx rules
+    - Disable -fexceptions on multipath-udeb (LP #1489379):
+      - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+        with CFLAGS_DISABLE_FEXCEPTIONS.
+      - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+    - debian/initramfs/local-bottom: remember to stop multipathd.
+    - Add and fixup d/initramfs/local-premount:
+      - wait for udev to settle before the call to resolve_device()
+        (LP #1503286)
+      - Run multipath with -B so not to assign names nor change
+        /etc/multipath/bindings during initramfs (LP #1561103)
+      - debian/rules: install debian/initramfs/local-premount
+    - debian/rules: install debian/initramfs/local-bottom
+    - debian/patches/kpartx_more_loopback_fixes.patch: fix loopback mounted
+      files some more (LP #1543430)
+    - Remove partition device nodes of individual paths (for LVM on multipath)
+      (LP #1540401)
+      - debian/multipath-tools.dm-mpath-lvm.udev: udev rule for that
+      - debian/initramfs/init-top: load the dm-multipath module
+      - debian/initramfs/init-top: start multipathd before udev
+      - init-top: load modules (dm-multipath and SCSI device handlers);
+        move the missing dm-emc there (now scsi-dh-emc; see BTS 567014).
+      - debian/multipath-tools.dm-mpath-lvm.udev
+    - debian/rules: do not install local-top anymore.
+    - debian/patches/enable-find-multipaths.patch: re-enable find_multipaths
+      by default -- see the removed 'add_find-multipaths.patch' (LP #1463046)
+    - Fixes typo in package description (availibility -> availability)
+      (LP: #1231182)
+    - debian/initramfs/hooks:
+      - Add dm-queue-length: users may want to change from the default
+        selector and should be able to do so. (LP: #1673350)
+    - debian/initramfs/local-bottom: wait for the multipathd unix socket to
+      close, so to avoid multipathd.socket unit failure. (LP: #1682178)
+    - debian/tests/tgtbasedmpaths: Add sleep to allow for device creation
+    - Adjust initramfs integration for new udev rules
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch:
+      Improve finding loopback devices (LP #1747044)
+    - d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch:
+      Print loop deleted message to stdout again, not stderr; to fix autopkgtest
+    - Install friendly names multipath.conf by default
+    - Use stable wwn-* names in autopkgtest that work with or without
+      friendly names, as scsi- is not a stable symlink name
+    - Do not attempt to start multipath-tools in containers
+    - UPDATES to match the new upstream version:
+      - d/p/disable-fexceptions-udeb.patch
+      - d/p/enable-find-multipaths.patch
+      - d/p/kpartx-Improve-finding-loopback-device-by-file.patch
+    - Ensure udebs have the same udev rules as installed systems (LP: #1825189)
+    - Revert "Ensure udebs have the same udev rules as installed systems
+      (LP: #1825189)" for now. Udev rules get in the way at the moment.
+    - Stop producing udebs on i386 where we no longer have d-i or a kernel.
+    - Fix debian/rules to not explode when building without udebs on i386.
+    - Don't build the multipath-tools binary package on i386; we only
+      want kpartx.
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 07 Feb 2020 03:26:35 +0000
+
 multipath-tools (0.8.3-1) unstable; urgency=medium
 
   * [6b91b76] New upstream version 0.8.3
@@ -5,6 +83,144 @@ multipath-tools (0.8.3-1) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Wed, 08 Jan 2020 21:45:44 +0530
 
+multipath-tools (0.7.9-3ubuntu7) focal; urgency=medium
+
+  * Don't build the multipath-tools binary package on i386; we only want
+    kpartx.
+
+ -- Steve Langasek <[e-mail]>  Tue, 07 Jan 2020 14:00:24 -0800
+
+multipath-tools (0.7.9-3ubuntu6) eoan; urgency=medium
+
+  * Fix debian/rules to not explode when building without udebs on i386.
+
+ -- Adam Conrad <[e-mail]>  Wed, 09 Oct 2019 15:22:33 -0600
+
+multipath-tools (0.7.9-3ubuntu5) eoan; urgency=medium
+
+  * Stop producing udebs on i386 where we no longer have d-i or a kernel.
+
+ -- Adam Conrad <[e-mail]>  Wed, 09 Oct 2019 14:09:21 -0600
+
+multipath-tools (0.7.9-3ubuntu4) eoan; urgency=medium
+
+  * Rebuild against new libjson-c4.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sat, 29 Jun 2019 13:55:54 +0200
+
+multipath-tools (0.7.9-3ubuntu3) eoan; urgency=medium
+
+  * Revert "Ensure udebs have the same udev rules as installed
+    systems. LP: #1825189" for now. Udev rules get in the way at the
+    moment.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 21 May 2019 12:34:41 +0100
+
+multipath-tools (0.7.9-3ubuntu2) eoan; urgency=medium
+
+  * Ensure udebs have the same udev rules as installed systems. LP:
+    #1825189
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 21 May 2019 12:34:41 +0100
+
+multipath-tools (0.7.9-3ubuntu1) eoan; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - d/control:
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP 1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP 1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP 1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP 1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP 1231182)
+    - debian/initramfs/local-bottom: wait for the multipathd unix socket
+      to close, so to avoid multipathd.socket unit failure. (LP 1682178)
+    - debian/initramfs/hooks: Add dm-queue-length: users may want to change
+      from the default selector and should be able to do so. (LP 1673350)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - Install friendly names multipath.conf by default, instead of
+      generating it in every installer.
+    - Use stable wwn-* names in autopkgtest that work with or without
+      friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+    - Do not attempt to start multipath-tools in containers, should switch
+      for on-demand udev/socket based activation in the future. LP 1823093
+    - Adjust initramfs integration for new udev rules
+    - debian/tests/tgtbasedmpaths: Add sleep to allow for device creation
+  * Dropped changes:
+    - Install dm-parts.rule
+    - Fix /usr/lib/udev to be /lib/udev
+    - Move udev rules at position 11 to position 56
+    - Fix 11-dm-mpath.rules to check for DM_UDEV_RULES, not DM_UDEV_RULES_VSN
+    - d/rules: Run dh_clean from clean target
+    - Install 68-del-part-nodes.rules
+      [all above in Debian now]
+    - Import upstream commit to fix crash in multipathd
+      [part of the new upstream version]
+    - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      [new upstream sets umask before calling before uxsock_listen]
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+      [no more needed post 18.04]
+    - Apply fix from fedora to trigger change uevent on device creation,
+      this also ensures new devices are discovered automatically.
+      [upstream since 0.7.7]
+  * Added Changes:
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch
+      [updated to match new upstream version]
+    - d/p/disable-fexceptions-udeb.patch: to match new upstream version
+      [updated to match new upstream version]
+    - d/p/enable-find-multipaths.patch: since upstream change c36f2f42 we need
+      to set yes to retain the Ubuntu behavior instead of 1 as we did before.
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch
+      [updated to match new upstream version]
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 29 Apr 2019 16:14:26 +0200
+
 multipath-tools (0.7.9-3) unstable; urgency=medium
 
   * [51a7724] Reliably extract the running systemd version
@@ -98,6 +314,126 @@ multipath-tools (0.7.4-3) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 10 Feb 2018 11:23:20 +0530
 
+multipath-tools (0.7.4-2ubuntu8) disco; urgency=medium
+
+  * Do not attempt to start multipath-tools in containers, should switch
+    for on-demand udev/socket based activation in the future. LP: #1823093
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 15 Apr 2019 11:10:32 +0100
+
+multipath-tools (0.7.4-2ubuntu7) disco; urgency=medium
+
+  * Use stable wwn-* names in autopkgtest that work with or without
+    friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 02 Apr 2019 13:22:51 +0100
+
+multipath-tools (0.7.4-2ubuntu6) disco; urgency=medium
+
+  * Install friendly names multipath.conf by default, instead of
+    generating it in every installer.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 20 Mar 2019 23:02:30 +0000
+
+multipath-tools (0.7.4-2ubuntu4) disco; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <[e-mail]>  Mon, 14 Jan 2019 20:02:28 +0000
+
+multipath-tools (0.7.4-2ubuntu3) bionic; urgency=medium
+
+  * d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+    deleted message to stdout again, not stderr; to fix autopkgtest
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 05 Feb 2018 11:46:37 +0100
+
+multipath-tools (0.7.4-2ubuntu2) bionic; urgency=medium
+
+  * d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+    finding loopback devices (LP: #1747044)
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 05 Feb 2018 10:06:19 +0100
+
+multipath-tools (0.7.4-2ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian. (LP: #1710697, LP: #1711749) Remaining changes:
+    - d/control:
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP 1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP 1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP 1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP 1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP 1231182)
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+    - debian/initramfs/local-bottom: wait for the multipathd unix socket
+      to close, so to avoid multipathd.socket unit failure. (LP 1682178)
+    - debian/initramfs/hooks: Add dm-queue-length: users may want to change
+      from the default selector and should be able to do so. (LP 1673350)
+  * Dropped changes:
+    - Remove partition device nodes of individual paths (for LVM on multipath)
+      on the new multipath-tools with udev property blacklisting (LP 1540401)
+      + Replaced by 68-del-part-nodes.rules
+      + known as "dm-mpath-lvm.rules", also dropped initramfs for that
+  * New changes:
+    - Install dm-parts.rule
+    - Fix /usr/lib/udev to be /lib/udev
+    - Move udev rules at position 11 to position 56
+    - Fix 11-dm-mpath.rules to check for DM_UDEV_RULES, not DM_UDEV_RULES_VSN
+    - d/rules: Run dh_clean from clean target
+    - Install 68-del-part-nodes.rules
+    - Import upstream commit to fix crash in multipathd
+    - Adjust initramfs integration for new udev rules
+    - Apply fix from fedora to trigger change uevent on device creation,
+      this also ensures new devices are discovered automatically.
+    - debian/tests/tgtbasedmpaths: Add sleep to allow for device creation
+    - d/patches: Add DEP-3 headers to our own patches
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 24 Jan 2018 10:57:46 +0100
+
 multipath-tools (0.7.4-2) unstable; urgency=medium
 
   * Upload to Unstable
@@ -129,6 +465,89 @@ multipath-tools (0.7.4-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 22 Dec 2017 11:49:58 +0530
 
+multipath-tools (0.6.4-5ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. (LP: #1548303) Remaining changes:
+    - d/control:
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP 1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP 1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy dm-mpath-lvm & multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP 1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP 1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     on the new multipath-tools with udev property blacklisting (LP 1540401)
+     - d/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+     - d/initramfs/init-top: load the dm-multipath module for
+       'multipath -c'.
+     - d/initramfs/init-top: start multipathd before udev (required by
+       'multipath -u' in the udev rules)
+     - d/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+     - d/rules: rename multipath-tools udev to dm-mpath-lvm
+     - d/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+       'multipath -u' which can read udev properties at PROGRAM-rule time
+       (when udev properties are not yet written to the udev database).
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP 1231182)
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+    - debian/initramfs/local-bottom: wait for the multipathd unix socket
+      to close, so to avoid multipathd.socket unit failure. (LP 1682178)
+    - debian/initramfs/hooks: Add dm-queue-length: users may want to change
+      from the default selector and should be able to do so. (LP 1673350)
+  * Drop changes (in Debian now):
+    - d/control: Bump udev dependencies (in Debian)
+    - debian/initramfs/hooks:
+      - Remove old dm-emc module; it hasn't been in kernel since 2.6.27.
+    - d/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+      where uploads might break kpartx's loopback file handling.
+    - mark kpartx tests as isolation-machine to avoid issues in e.g. LXD
+      autopkgtest environments (LP 1644253)
+    - d/t/tgtbasedmpaths add Test using tgt and open-iscsi to excercise
+      multipath
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 18 Jul 2017 14:12:53 +0200
+
 multipath-tools (0.6.4-5) unstable; urgency=medium
 
   * Ship multipath udev rules (Closes: #858456)
@@ -152,6 +571,163 @@ multipath-tools (0.6.4-4) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Mon, 20 Feb 2017 19:36:31 +0530
 
+multipath-tools (0.6.4-3ubuntu6) artful; urgency=medium
+
+  * Rebuild against new liburcu6.
+
+ -- Gianfranco Costamagna <[e-mail]>  Tue, 18 Jul 2017 12:08:33 +0200
+
+multipath-tools (0.6.4-3ubuntu5) artful; urgency=medium
+
+  * No-change rebuild against latest liburcu
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 15 Jul 2017 09:44:44 -0400
+
+multipath-tools (0.6.4-3ubuntu4) zesty; urgency=medium
+
+  * debian/initramfs/local-bottom: wait for the multipathd unix socket
+    to close, so to avoid multipathd.socket unit failure. (LP: #1682178)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Wed, 12 Apr 2017 14:30:13 -0400
+
+multipath-tools (0.6.4-3ubuntu3) zesty; urgency=medium
+
+  * debian/initramfs/hooks, debian/initramfs/local-bottom:
+    Update hooks and local-bottom to use /run instead of /var/run as a path
+    for multipathd.pid in the initramfs. (LP: #1670811)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 28 Mar 2017 21:20:22 -0400
+
+multipath-tools (0.6.4-3ubuntu2) zesty; urgency=medium
+
+  * debian/initramfs/hooks:
+    - Remove old dm-emc module; it hasn't been in kernel since 2.6.27.
+    - Add dm-queue-length: users may want to change from the default selector
+      and should be able to do so. (LP: #1673350)
+  * debian/patches/path_selector.patch, debian/patches/series: remove
+    path_selector.patch to get back to the "right" default selector of
+    service-time, which has been included in the kernel module packages for
+    a while now and has better throughput than round-robin. It's also the
+    default upstream. (LP: #1634161)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 17 Mar 2017 09:37:36 -0400
+
+multipath-tools (0.6.4-3ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. (LP: #1621340, LP: #1645274) Remaining changes:
+    - d/control:
+      - Bump udev dependencies
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches (some refreshed to new version) to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/path_selector.patch: switch the default path selector
+        back to round-robin while service-time isn't available to the installer
+        multipath-modules.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP: #1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP: #1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP: #1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy dm-mpath-lvm & multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP: #1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP: #1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     (LP: #1540401)
+   - Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - d/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+     where uploads might break kpartx's loopback file handling.
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     on the new multipath-tools with udev property blacklisting (LP: #1540401)
+     - d/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+     - d/initramfs/init-top: load the dm-multipath module for
+       'multipath -c'.
+     - d/initramfs/init-top: start multipathd before udev (required by
+       'multipath -u' in the udev rules)
+     - d/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+     - d/rules: rename multipath-tools udev to dm-mpath-lvm
+     - d/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+       'multipath -u' which can read udev properties at PROGRAM-rule time
+       (when udev properties are not yet written to the udev database).
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP: #1231182)
+  * Add changes:
+    - mark kpartx tests as isolation-machine to avoid issues in e.g. LXD
+      autopkgtest environments (LP: #1644253)
+    - d/t/tgtbasedmpaths add Test using tgt and open-iscsi to excercise
+      multipath
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+  * Drop changes:
+    - d/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls.
+      (file no more used)
+    - d/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+      (file no more used)
+    - d/initramfs/local-top: run multipathd rather than a one-off call to
+      multipath so that new paths can be correctly added as detected while we're
+      still in the initramfs.
+      (file no more used)
+    - Call clean target before rebuilding with systemd support (in Debian)
+    - drop build-dep to dpkg-dev (>= 1.16.1~), libudev-dev"
+      (No more needed)
+    - Bump Standards-Version to 3.9.6 (in Debian)
+    - add / to LIB= of DEB_CFLAGS_MAINT_APPEND (in Debian)
+    - d/p/handle_spaces_in_rev_attr.patch: support IBM IPR devices and others
+      which may have only spaces for the rev attribute. (upstream)
+    - d/p/0015-shared-lock-for-udev.patch: (LP: #1431650) (upstream)
+    - d/p/0053-readonly-bindings_multipathd_prod.patch: support
+      -B to allow multipathd to handle cases where the bindings file is
+      read-only. (upstream)
+    - d/p/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal with
+      spaces in device names in kpartx too (LP: #1432062) (upstream)
+    - d/p/0001-multipath-tools-fix-dm-device-filtering.patch: Allow
+      filtering of DEV_UEVENT dev_type (LP: #1570093) (upstream)
+    - d/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+      from the old device names with device numbers to using letters for devices.
+      (no relevant upgrade path left)
+    - d/p/mpath_name_migration.patch: ship a multipath_migrate binary
+      to make translation from pre-0.5.0 device naming to the new scheme.
+      (no relevant upgrade path left)
+    - d/initramfs/hooks: use 95 not 60 for multipath rules priority (file not
+      shipped anymore, so no need to touch)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 27 Jan 2017 09:09:37 +0100
+
 multipath-tools (0.6.4-3) unstable; urgency=medium
 
   * [3eecdba] Include libmpathcmd.so in the udeb package.
@@ -284,6 +860,164 @@ multipath-tools (0.5.0+git1.656f8865-6) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 12 Mar 2016 17:47:25 +0530
 
+multipath-tools (0.5.0+git1.656f8865-5ubuntu7) yakkety; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 17 Sep 2016 12:06:37 +0000
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu6) yakkety; urgency=medium
+
+  * Fixes typo in package description (availibility -> availability)
+    (LP: #1231182)
+
+ -- Hans Joachim Desserud <[e-mail]>  Sun, 04 Sep 2016 13:19:49 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu5) yakkety; urgency=medium
+
+  [ Dragan Stancevic ]
+  * d/p/0001-multipath-tools-fix-dm-device-filtering.patch :
+    multipath-tools: fix dm- device filtering
+   - Allow filtering of DEV_UEVENT dev_type
+   - Resolves LP: #1570093
+   - Proper patch included in the source package this time. Previous upload
+     only had the changelog entry.
+
+ -- Louis Bouchard <[e-mail]>  Tue, 19 Jul 2016 14:17:14 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu4) yakkety; urgency=medium
+
+  [ Dragan Stancevic ]
+  * multipath-tools: fix dm- device filtering
+   - Allow filtering of DEV_UEVENT dev_type
+   - Resolves LP: #1570093
+
+ -- Louis Bouchard <[e-mail]>  Mon, 18 Jul 2016 12:37:04 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu3) yakkety; urgency=medium
+
+  * Cherrypick from debian:
+   - Call clean target before rebuilding with systemd support
+   - Call systemd in debian/rules. Also adapt init service
+     aliasing.
+   - Should resolve LP: #1578638, LP: #1589526, LP: #1583563.
+ 
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 16 Jun 2016 11:53:33 +0300
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu2) xenial; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Remove partition device nodes of individual paths (for LVM on multipath)
+    on the new multipath-tools with udev property blacklisting (LP: #1540401)
+    - debian/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+      'multipath -u' which can read udev properties at PROGRAM-rule time
+      (when udev properties are not yet written to the udev database).
+    - debian/initramfs/init-top: start multipathd before udev (required by
+      'multipath -u' in the udev rules)
+    - debian/initramfs/local-top: remove snippet to start multipathd.
+  * Remove debian/initramfs/local-top (redundant with other initramfs scripts):
+    - init-top: start multipathd.
+    - init-top: load modules (dm-multipath and SCSI device handlers); move the
+      missing dm-emc there (now scsi-dh-emc; see BTS 567014).
+    - local-premount: settle on udev events; and the extra call due to
+      multipath discovery in udev rules is no longer required with multipathd
+      in initramfs.
+    - debian/rules: do not install local-top anymore.
+  * debian/initramfs/local-premount: run multipath with -B so not to assign
+    names nor change /etc/multipath/bindings during initramfs (LP: #1561103)
+  * debian/patches/enable-find-multipaths.patch: re-enable find_multipaths
+    by default -- see the removed 'add_find-multipaths.patch' (LP: #1463046) 
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 04 Apr 2016 22:36:48 -0400
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian. (LP: #1551952) (LP: #1540407)
+    Remaining changes:
+    - debian/control:
+      - Bump debhelper dependency to install udev rules to
+        /lib/udev/rules.d
+      - Bump udev dependencies as well
+    - debian/control:
+      - multipath-tools: add sg3-utils-dev Depends
+      - multipath-udeb: add sg3-udeb Depends
+    - debian/initramfs/hooks: use 95 not 60 for multipath rules priority
+    - debian/rules: Move udev rules to priority 95, because rules that load modules should be >90.
+    - debian/multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - debian/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls.
+    - debian/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+      - debian/initramfs/kpartx.hook
+      - debian/kpartx-boot.postinst
+      - debian/kpartx-boot.postrm
+      - debian/kpartx.install
+      - debian/control: Add kpartx-boot package for dmraid
+      - debian/rules: Install kpartx initramfs hook
+    - debian/patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - debian/patches/handle_spaces_in_rev_attr.patch: support IBM IPR devices
+      and others which may have only spaces for the rev attribute.
+    - debian/patches/path_selector.patch: switch the default path selector
+      back to round-robin while service-time isn't available to the installer
+      multipath-modules.
+    - debian/patches/0015-shared-lock-for-udev.patch: (LP: #1431650)
+    - debian/initramfs/hooks: also copy wwids file on the installed system to
+      ensure all paths come up on boot. (LP: #1479929)
+    - Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+      libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+      which is not available in the installer environment.
+      - debian/patches/disable-fexceptions-udeb.patch: conditionally disable
+        -fexceptions with CFLAGS_DISABLE_FEXCEPTIONS.
+      - debian/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+    - debian/patches/handle_spaces_in_rev_attr.patch: update patch to apply the
+      change to the right line (LP: #1492425)
+    - debian/initramfs/local-premount: wait for udev to settle before the call
+      to resolve_device() in local_mount_root(), so the by-uuid/ symlinks have
+      a chance to be updated by the multipath udev rules (LP: #1503286).
+    - debian/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+      from the old device names with device numbers to using letters for devices.
+    - debian/patches/mpath_name_migration.patch: ship a multipath_migrate binary
+      to make translation from pre-0.5.0 device naming to the new scheme.
+    - debian/initramfs/hooks: install multipathd and required directories.
+    - debian/initramfs/local-premount: reload all maps to make sure they're
+      indeed loaded and ready before we end premount.
+    - debian/initramfs/local-top: run multipathd rather than a one-off call to
+      multipath so that new paths can be correctly added as detected while we're
+      still in the initramfs.
+    - debian/initramfs/local-bottom: remember to stop multipathd.
+    - debian/rules: install debian/initramfs/local-bottom
+    - debian/patches/0053-readonly-bindings_multipathd_prod.patch: support -B to
+      allow multipathd to handle cases where the bindings file is read-only.
+      (LP: #1526984)
+    - debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal
+      with spaces in device names in kpartx too (LP: #1432062)
+    - debian/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+      where uploads might break kpartx's loopback file handling.
+    - debian/patches/kpartx_more_loopback_fixes.patch: fix loopback mounted
+      files some more: since we stat() the loopback device node, we can't rely
+      on S_ISREG() tests to handle this case, and should look at the device
+      itself instead. (LP: #1543430)
+    - Remove partition device nodes of individual paths (for LVM on multipath)
+      (LP: #1540401)
+      - debian/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+      - debian/initramfs/hooks: copy the udev rule and partx to the initramfs.
+      - debian/initramfs/init-top: load the dm-multipath module for 'multipath -c'.
+      - debian/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+    - debian/rules: don't ship 95-multipath.rules udev rules anymore; they are
+      not necessary with multipath-tools listening for udev events directly.
+  * Drop changes:
+    - debian/patches/series: Drop obsolete patches already included upstream
+      - debian/patches/ignore_devices_nodename_fail.patch
+      - debian/patches/skip_usb_devices.patch
+      - debian/patches/0014-kpartx-long-path.patch
+      - debian/patches/0052-readonly-bindings_multipathd.patch
+      - debian/patches/add_find-multipaths.patch
+      - debian/patches/dm-multipath-backlist-nvme-5c412e47.patch
+
+ -- Ryan Harper <[e-mail]>  Wed, 09 Mar 2016 10:21:26 -0600
+
 multipath-tools (0.5.0+git1.656f8865-5) unstable; urgency=medium
 
   * [e91ac62] Fix build to properly generate the arch-independent
@@ -374,6 +1108,190 @@ multipath-tools (0.5.0+git0.770e6d0d-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sun, 09 Aug 2015 14:42:48 +0530
 
+multipath-tools (0.5.0-7ubuntu16) xenial; urgency=medium
+
+  * debian/patches/dm-multipath-backlist-nvme-5c412e47.patch: blacklist NVMe
+    from multipath, otherwise kpartx calls will hang. This is because mpath
+    works at the request level (which NVMe bypasses), so multipathing is not
+    supported on NVMe. (LP: #1551828)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 01 Mar 2016 11:55:13 -0500
+
+multipath-tools (0.5.0-7ubuntu15) xenial; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Remove partition device nodes of individual paths (for LVM on multipath)
+    (LP: #1540401)
+    - debian/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+    - debian/initramfs/hooks: copy the udev rule and partx to the initramfs.
+    - debian/initramfs/init-top: load the dm-multipath module for 'multipath -c'.
+    - debian/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+  * debian/rules: don't ship 95-multipath.rules udev rules anymore; they are
+    not necessary with multipath-tools listening for udev events directly.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 11 Feb 2016 19:08:14 -0500
+
+multipath-tools (0.5.0-7ubuntu14) xenial; urgency=medium
+
+  * debian/patches/kpartx_more_loopback_fixes.patch: fix loopback mounted
+    files some more: since we stat() the loopback device node, we can't rely
+    on S_ISREG() tests to handle this case, and should look at the device
+    itself instead. (LP: #1543430)
+  * debian/tests/kpartx-file-loopback: check for left-over loop devices after
+    deleting a map.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 09 Feb 2016 15:24:27 -0500
+
+multipath-tools (0.5.0-7ubuntu13) xenial; urgency=medium
+
+  * Check that losetup -f is the same in the autopkgtest, after a cycle of
+    kpartx -a/-d. Looks like it's currently failing to cleanup loop0 in
+    addition to cleaning loop0p1. See http://pad.lv/1543430
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 09 Feb 2016 06:51:15 +0000
+
+multipath-tools (0.5.0-7ubuntu12) xenial; urgency=medium
+
+  * Use synchronous kpartx calls in the adt tests, to hopefully avoid
+    kernel/userspace races which result in failure to remove mapped
+    partitions. Also invoke udevadm settle.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 02 Feb 2016 20:26:34 +0000
+
+multipath-tools (0.5.0-7ubuntu11) xenial; urgency=medium
+
+  * debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: fixup
+    to correct deal with loopback-mounting files. (LP: #1540660)
+  * debian/patches/mpath_name_migration.patch: make sure multipath_migrate gets
+    cleaned up otherwise running debuild twice will fail.
+  * debian/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+    where uploads might break kpartx's loopback file handling.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 01 Feb 2016 23:27:08 -0500
+
+multipath-tools (0.5.0-7ubuntu10) xenial; urgency=medium
+
+  * debian/patches/0052-readonly-bindings_multipathd.patch,
+    debian/patches/0053-readonly-bindings_multipathd_prod.patch: support -B to
+    allow multipathd to handle cases where the bindings file is read-only.
+    (LP: #1526984)
+  * debian/initramfs/hooks: install multipathd and required directories.
+  * debian/initramfs/local-bottom, debian/rules: install local-bottom for
+    initramfs.
+  * debian/initramfs/local-premount: reload all maps to make sure they're
+    indeed loaded and ready before we end premount.
+  * debian/initramfs/local-top: run multipathd rather than a one-off call to
+    multipath so that new paths can be correctly added as detected while we're
+    still in the initramfs.
+  * debian/initramfs/local-bottom: remember to stop multipathd.
+  * debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal
+    with spaces in device names in kpartx too (LP: #1432062)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 27 Jan 2016 10:42:51 -0500
+
+multipath-tools (0.5.0-7ubuntu9) xenial; urgency=medium
+
+  * d/p/lp1503305_libmultipath_info_on_1st_path_down_dbd131e.patch:
+    Correctly display the vendor/model info on path line in output if the
+    first path of a path group is failed. (LP: #1503305)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 03 Nov 2015 18:34:09 -0600
+
+multipath-tools (0.5.0-7ubuntu8) xenial; urgency=medium
+
+  * debian/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+    from the old device names with device numbers to using letters for devices.
+  * debian/patches/mpath_name_migration.patch: ship a multipath_migrate binary
+    to make translation from pre-0.5.0 device naming to the new scheme.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 22 Oct 2015 12:38:45 +0100
+
+multipath-tools (0.5.0-7ubuntu7) wily; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * debian/initramfs/local-premount: wait for udev to settle before the call
+    to resolve_device() in local_mount_root(), so the by-uuid/ symlinks have
+    a chance to be updated by the multipath udev rules (LP: #1503286).
+
+ -- Steve Langasek <[e-mail]>  Mon, 19 Oct 2015 22:56:58 -0700
+
+multipath-tools (0.5.0-7ubuntu6) wily; urgency=medium
+
+  * debian/patches/handle_spaces_in_rev_attr.patch: update patch to apply the
+    change to the right line (LP: #1492425)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Fri, 18 Sep 2015 10:16:50 -0400
+
+multipath-tools (0.5.0-7ubuntu5) wily; urgency=medium
+
+  * debian/patches/0014-kpartx-long-path.patch: have kpartx match loopback
+    files by device and inode rather than by path, as paths are not complete
+    enough to do specific matching for long paths (> 64 chars) or relative
+    paths. (LP: #1469143)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 17 Sep 2015 11:10:38 -0400
+
+multipath-tools (0.5.0-7ubuntu4) wily; urgency=medium
+
+  * Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+    libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+    which is not available in the installer environment.
+    - debian/patches/disable-fexceptions-udeb.patch: conditionally disable
+      -fexceptions with CFLAGS_DISABLE_FEXCEPTIONS.
+    - debian/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Thu, 03 Sep 2015 07:29:59 -0400
+
+multipath-tools (0.5.0-7ubuntu3) wily; urgency=medium
+
+  * debian/initramfs/hooks: also copy wwids file on the installed system to
+    ensure all paths come up on boot. (LP: #1479929)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 30 Jul 2015 16:34:28 -0400
+
+multipath-tools (0.5.0-7ubuntu2) wily; urgency=medium
+
+  * debian/patches/add_find-multipaths.patch: properly handle local non-mpath
+    devices. (LP: #1463046)
+  * debian/patches/ignore_devices_nodename_fail.patch: ignore devices for which
+    sysfs_get_tgt_nodename fails.
+  * debian/patches/skip_usb_devices.patch: skip USB devices during discovery.
+    (LP: #1468897) 
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 10 Jul 2015 15:53:37 -0400
+
+multipath-tools (0.5.0-7ubuntu1) wily; urgency=medium
+
+  * Merge from debian unstable, remaining changes: (LP: #1455482)
+    - control:
+      * Bump debhelper dependency to install udev rules to
+        /lib/udev/rules.d, bump udev dependencies as well.
+    - initramfs/hooks: use 95 not 60 for multipath rules priority
+    - multipath-tools-boot.init: remove in favor of kpartx.udev rules (at top)
+    - multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - debian/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls. 
+    - debian/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+    - Added debian/patches/0015-shared-lock-for-udev.patch (LP: #1431650)
+  * debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch: add
+    SCSI_IDENT_* properties to blacklist exceptions, so that we can have QEMU
+    multipathed devices as well as others (IBM IPR) detected properly as
+    multipathed devices.
+  * debian/patches/handle_spaces_in_rev_attr.patch: support IBM IPR devices
+    and others which may have only spaces for the rev attribute.
+  * debian/patches/path_selector.patch: switch the default path selector
+    back to round-robin while service-time isn't available to the installer
+    multipath-modules.
+  * debian/control: add sg3-udeb to multipath-udeb Depends.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 06 Jul 2015 13:15:22 -0400
+
 multipath-tools (0.5.0-7) unstable; urgency=medium
 
   * [15ecad9] Add dm-service-time path checker.
@@ -525,6 +1443,100 @@ multipath-tools (0.4.9+git0.4dfdaf2b-1) experimental; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 10 Feb 2012 18:25:29 +0530
 
+multipath-tools (0.4.9-3ubuntu12) vivid; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Support disks with non 512-byte sectors (LP: #1441930)
+    - Added 0016-kpartx-non-512B-GPT.patch
+    - Added 0017-kpartx-non-512B-sectors.patch
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/0018-ext-part-gt-512B-sectors.patch: fix extended partition
+    size for > 512B sectors. Patch cherry-picked from git commit 7202f225.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 13 Apr 2015 09:23:29 -0500
+
+multipath-tools (0.4.9-3ubuntu11) vivid; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Added debian/patches/0015-shared-lock-for-udev.patch (LP: #1431650)
+  * debian/initramfs/local-top: wait for udev to settle before running
+    'multipath' in order to avoid race condition on device-mapper calls. 
+
+  [ Mathieu Trudel-Lapierre ]
+  * Drop scsi_wait_scan from the multipath initramfs script: that module
+    no longer exists.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 23 Mar 2015 14:56:37 -0400
+
+multipath-tools (0.4.9-3ubuntu10) utopic; urgency=medium
+
+  * 1002-fix-linking-library.patch: Move $(LIBDEPS) to the end of the
+    link line to fix underlinking with ld --as-needed (LP: #1004243)
+
+ -- Adam Conrad <[e-mail]>  Mon, 13 Oct 2014 07:47:07 -0600
+
+multipath-tools (0.4.9-3ubuntu9) utopic; urgency=medium
+
+  * Added 0011-libmultipath-update-waiter-handling.patch (LP: #1354114)
+  * Added 0012-Race-condition-when-calling-stop_waiter_thread.patch (LP: #1354114)
+  * Added 0013-multipath-clean-up-code-for-stopping-the-waiter-thre.patch (LP: #1354114)
+  * Added 0014-Fix-race-condition-in-stop_waiter_thread.patch (LP: #1354114)
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 02 Sep 2014 15:43:38 -0700
+
+multipath-tools (0.4.9-3ubuntu8) utopic; urgency=medium
+
+  * Remove RUN+="socket:" statement in rules file since it is
+    no longer supported after version 178 (LP: #1240049)
+
+ -- Seyeong Kim <[e-mail]>  Fri, 18 Jul 2014 10:37:35 +0200
+
+multipath-tools (0.4.9-3ubuntu7) raring; urgency=low
+
+  * Add 0010-fix-extended-partitions.patch: Only expose the
+    first two sectors of the extended partition (LP: #1093918).
+
+ -- Phillip Susi <[e-mail]>  Fri, 04 Jan 2013 16:14:34 -0500
+
+multipath-tools (0.4.9-3ubuntu6) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Fri, 05 Oct 2012 14:00:37 +0100
+
+multipath-tools (0.4.9-3ubuntu5) precise; urgency=low
+
+  * Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+
+ -- Phillip Susi <[e-mail]>  Tue, 20 Mar 2012 15:26:22 -0400
+
+multipath-tools (0.4.9-3ubuntu4) precise; urgency=low
+
+  * Restore multipath-udeb dependency on multipath-modules (LP: #959749).
+
+ -- Colin Watson <[e-mail]>  Wed, 21 Mar 2012 14:34:01 +0000
+
+multipath-tools (0.4.9-3ubuntu3) precise; urgency=low
+
+  * Move kpartx from multipath-udeb to a new kpartx-udeb package
+    (LP: #922646).
+
+ -- Colin Watson <[e-mail]>  Fri, 27 Jan 2012 23:04:23 +0000
+
+multipath-tools (0.4.9-3ubuntu2) precise; urgency=low
+
+  * Add 0009-fix-delim.patch: The 'p' delimiter was being added
+    when it shouldn't.
+
+ -- Phillip Susi <[e-mail]>  Sun, 08 Jan 2012 20:57:47 -0500
+
+multipath-tools (0.4.9-3ubuntu1) precise; urgency=low
+
+  * Merge with Debian (for remaining changes, see 0.4.9-2ubuntu1).
+
+ -- Matthias Klose <[e-mail]>  Sun, 04 Dec 2011 21:32:48 +0100
+
 multipath-tools (0.4.9-3) unstable; urgency=low
 
   * [dd85b8b] Add example to kpartx manpage. Committed upstream.
@@ -538,6 +1550,36 @@ multipath-tools (0.4.9-3) unstable; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 03 Dec 2011 19:34:59 +0530
 
+multipath-tools (0.4.9-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - control:
+      * Bump debhelper dependency to install udev rules to
+       /lib/udev/rules.d, bump udev dependencies as well.
+      * multipath-udeb must not depend on multipath-modules, 
+        because the Ubuntu kernel already includes the modules and no 
+        package provides m-m.
+    - initramfs/hooks: use 95 not 60 for multipath rules priority
+    - multipath-tools-boot.init: remove in favor of kpartx.udev rules (at top)
+    - kpartx.udev:
+      * add rule to load dm-multipath
+      * use whole path when running /usr/lib/dmsetup_env
+      * call kpartx through dmsetup for mpath-* devices
+      * switch $name for $kernel for dmraid rule
+    - multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - Have initramfs local-top start with scsi_wait_scan, and make sure all
+      devices have been found before bothering to call udevadm settle.
+    - debian/initramfs/local-top: wait for scsi_wait_scan
+  * *.install: use /lib*/ instead of /lib/ to catch /lib64
+  * debian/initramfs/local-top: remove '--timeout 10' which causes my
+    test system to not boot roughly 3 out of 4 times.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 06 Jun 2011 12:31:23 -0500
+
 multipath-tools (0.4.9-2) unstable; urgency=low
 
   * [2544655] wait harder for multipath init. Thanks to Serge Hallyn for
@@ -712,6 +1754,108 @@ multipath-tools (0.4.8-15) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Mon, 06 Apr 2009 19:36:25 +0200
 
+multipath-tools (0.4.8-14ubuntu11) oneiric; urgency=low
+
+  * Fixes some return logic issues in the blacklist.c:_filter_path function
+    where using blacklist and blacklist_exceptions would cause multipathd to
+    improperly filter paths. (LP: #789229)
+    - The patch was created by Christophe Varoqui in 2007.
+      + http://www.redhat.com/archives/dm-devel/2007-November/msg00054.html
+      + 0013-libmultipath-filter_path-fix_blacklist_filter_exit.patch
+    - [serge-hallyn] swap in the whole upstream git commit and call it
+      0013-blacklist_exception_issues.patch.
+
+ -- Craig Magina <[e-mail]>  Fri, 27 May 2011 11:47:19 -0400
+
+multipath-tools (0.4.8-14ubuntu10) natty; urgency=low
+
+  * pass '-p part' to kpartx in initramfs script, not '-p p', to
+    make sure /dev/mapper/ names are formed as expected.  (LP: #712840)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 03 Feb 2011 18:40:36 -0600
+
+multipath-tools (0.4.8-14ubuntu9) natty; urgency=low
+
+  * Fix segv caused by race condition with free_waiter threads during
+    shutdown, using backport from upstream.  (LP: #713237)
+
+ -- dann frazier <[e-mail]>  Thu, 03 Feb 2011 16:37:10 -0700
+
+multipath-tools (0.4.8-14ubuntu8) natty; urgency=low
+
+  * Fix segv on shutdown when log buffer is empty, using patch cherry-picked
+    from upstream.  (LP: #488285)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 01 Feb 2011 15:38:36 -0600
+
+multipath-tools (0.4.8-14ubuntu7) natty; urgency=low
+
+  * Add patch to fix the expected pathname from multipath uevents
+    (LP: #660597)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 16:06:29 -0600
+
+multipath-tools (0.4.8-14ubuntu6) natty; urgency=low
+
+  * Fix in debian/kpartx.udev:
+      - modprobe -q instead of incorrect modprobe -Q (LP: #644481)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 15:58:13 -0600
+
+multipath-tools (0.4.8-14ubuntu5) natty; urgency=low
+
+  * Make the initramfs local-top script wait until all devices
+    are mapped, to make sure no /dev/sd* get mounted before
+    multipath has a chance to take it. (LP: #686832)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 15:55:48 -0600
+
+multipath-tools (0.4.8-14ubuntu4) lucid; urgency=low
+
+  * debian/control: Move libreadline5-dev build dependency to libreadline-dev.
+    (Already done in Debian).
+
+ -- Martin Pitt <[e-mail]>  Mon, 08 Mar 2010 14:50:04 +0100
+
+multipath-tools (0.4.8-14ubuntu3) lucid; urgency=low
+
+  * Support failback for Intel Modular Server (LP: #520309).
+
+ -- Colin Watson <[e-mail]>  Fri, 12 Feb 2010 12:21:42 +0000
+
+multipath-tools (0.4.8-14ubuntu2) jaunty; urgency=low
+
+  * debian/kpartx.udev: Let dmsetup run kpartx, since $kernel doesn't map
+    right.
+  * debian/initramfs/hooks: Include /lib/udev/kpartx_id.
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 10 Mar 2009 11:54:01 +0200
+
+multipath-tools (0.4.8-14ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - control:
+     + Bump debhelper dependency to install udev rules to
+      /lib/udev/rules.d, bump udev dependencies as well.
+     + multipath-udeb must not depend on multipath-modules, 
+      because the Ubuntu kernel already includes the modules and no 
+      package provides m-m.
+    - initramfs/hooks: Install rules from /lib/udev/rules.d.
+    - kpartx.udev, multipath-tools-boot.init:
+      Replace multipath-tools-boot init script with udev rules.
+    - multipath-tools.preinst: Fix preinst script to modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - multipath-tools.prerm: Add prerm script to not fail when upgrading
+      from a broken version of multipathd.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+  * Fix bugs (LP: #316851, #320156)
+  * multipath-tools.prerm/preinst: Remove checks for old ubuntu
+    versions, we don't support upgrading from them anymore.
+  
+ -- Timo Aaltonen <[e-mail]>  Thu, 12 Feb 2009 15:07:42 +0200
+
 multipath-tools (0.4.8-14) unstable; urgency=low
 
   * [6dad4a0] kpartx: use uint64_t to account slices start/size based on
@@ -774,6 +1918,64 @@ multipath-tools (0.4.8-11) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Wed, 30 Jul 2008 17:59:03 -0400
 
+multipath-tools (0.4.8-10ubuntu6) jaunty; urgency=low
+
+  * debian/multipath-tools.preinst: Use the same logic as in
+    hw-detect to determine if dm_multipath is already loaded.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 15 Jan 2009 23:50:18 +0200
+
+multipath-tools (0.4.8-10ubuntu5) jaunty; urgency=low
+
+  * debian/initramfs/hooks: Install from /lib/udev/rules.d 
+
+ -- Scott James Remnant <[e-mail]>  Tue, 13 Jan 2009 03:05:02 +0000
+
+multipath-tools (0.4.8-10ubuntu4) jaunty; urgency=low
+
+  * Bump debhelper dependency to install udev rules to /lib/udev/rules.d,
+    bump udev dependencies as well. 
+
+ -- Scott James Remnant <[e-mail]>  Mon, 12 Jan 2009 22:03:11 +0000
+
+multipath-tools (0.4.8-10ubuntu3) jaunty; urgency=low
+
+  * fix_udev_scsi_id_arguments.diff:
+    Update the arguments for scsi_id. (LP: #306723)
+  * fix_sysfs_layout.diff:
+    Patch from upstream to use the new sysfs layout. (LP: #307032)
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 18 Dec 2008 15:32:20 +0200
+
+multipath-tools (0.4.8-10ubuntu2) jaunty; urgency=low
+
+  * debian/control: multipath-udeb must not depend on multipath-modules, 
+    because the Ubuntu kernel already includes the modules and no 
+    package provides m-m.
+  * debian/multipath-tools.preinst: Don't modprobe dm-multipath 
+    unconditionally, since it'll break during installation (no 
+    modprobe.dep) and when using a monolithic kernel. Instead check for 
+    these conditions. (LP: #182009)
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 02 Dec 2008 12:28:08 +0200
+
+multipath-tools (0.4.8-10ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Fix init script not to die on stop if multipathd is not running.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+
+ -- Soren Hansen <[e-mail]>  Thu, 26 Jun 2008 08:55:33 +0200
+
 multipath-tools (0.4.8-10) unstable; urgency=low
 
   * [183da2c] Add russion debconf translation (Closes: #486353) - thanks
@@ -807,6 +2009,32 @@ multipath-tools (0.4.8-8) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Sun, 09 Mar 2008 18:55:38 +0100
 
+multipath-tools (0.4.8-7ubuntu2) hardy; urgency=low
+
+  * Install udev rules in initramfs.
+  * Use temporary device name for creating partitions using kpartx.
+  * Big thanks to Dag Stenstad for testing and helping with debugging!
+
+ -- Soren Hansen <[e-mail]>  Wed, 19 Mar 2008 19:07:22 +0100
+
+multipath-tools (0.4.8-7ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - DebianMaintainerField.
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear.
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+  * Dropped our hsg80 changes. Kernel handles this correctly now.
+
+ -- Soren Hansen <[e-mail]>  Mon, 28 Jan 2008 11:09:45 +0100
+
 multipath-tools (0.4.8-7) unstable; urgency=low
 
   * add watch file
@@ -828,6 +2056,26 @@ multipath-tools (0.4.8-6) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Sat, 01 Dec 2007 15:41:36 +0100
 
+multipath-tools (0.4.8-5ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - DebianMaintainerField.
+    - Suggest sg3-utils, Conflict with sg-utils.
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Add /sbin/hsg80_start.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Fix init script not to die on stop if multipathd is not running.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+
+ -- Soren Hansen <[e-mail]>  Thu, 13 Dec 2007 03:03:31 +0100
+
 multipath-tools (0.4.8-5) unstable; urgency=low
 
   * apply kpartx-fix-udev-dmraid.diff to our shipped udev rules too
@@ -942,6 +2190,34 @@ multipath-tools (0.4.7-3) experimental; urgency=low
 
  -- Guido Guenther <[e-mail]>  Fri, 08 Jun 2007 11:51:00 +0200
 
+multipath-tools (0.4.7-2ubuntu3) gutsy; urgency=low
+
+  * Fix preinst script to modprobe dm-multipath. This will make sure
+    that multipathd will be able to start.
+
+  * Fix init script not to die on stop if multipathd is not running.
+
+  * Add prerm script to not fail when upgrading from a broken version of
+    multipathd.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 10 Aug 2007 13:03:39 +0200
+
+multipath-tools (0.4.7-2ubuntu2) gutsy; urgency=low
+  
+  * Fix udev rule to load dm-multipath.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 13 Jun 2007 11:56:52 +0200
+
+multipath-tools (0.4.7-2ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Remove multipath-tools-boot init script in favour of udev rules.
+    - Update udev rules as described in 0.4.7-1.1ubuntu3.
+    - Add /sbin/hsg80_start as described in 0.4.7-1.1ubuntu3.
+    - debian/control Ubuntu maintainer foobar.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 16 May 2007 11:02:20 +0200
+
 multipath-tools (0.4.7-2) unstable; urgency=low
 
   [ Bastian Blank ]
@@ -959,6 +2235,42 @@ multipath-tools (0.4.7-2) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Wed, 20 Dec 2006 17:40:59 +0100
 
+multipath-tools (0.4.7-1.1ubuntu3) feisty; urgency=low
+
+  * Remove multipath-tools-boot init script.
+
+  * Wild changes and updates to udev rules:
+    - All the hsg80 MULTIBUS FAILOVER are now handled here.
+    - Fix rule to call kpartx also on "change" udev events.
+    - Invoke multipath -v 0 device to make sure we hot plug
+      all devices into multipath.
+
+  * Add /sbin/hsg80_start that wraps all the work to make an hsg80 in
+    MULTIBUS FAILOVER working properly.
+    This is automatically called by udev.
+
+  (Closes LP: #98518)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 04 Apr 2007 08:17:48 +0200
+
+multipath-tools (0.4.7-1.1ubuntu2) feisty; urgency=low
+
+  * Remove devmap_name from this package, and Depend on dmsetup instead.
+    Fixes file overwrite conflict with dmsetup.  (LP 84894.)
+
+ -- Ian Jackson <[e-mail]>  Tue, 13 Feb 2007 16:16:46 +0000
+
+multipath-tools (0.4.7-1.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove stop links from rc0 and rc6
+    - suggest sg3-utils, conflict sg-utils
+    - fix path to scsi_id
+    - ubuntu udev rules
+    - set umask
+
+ -- Scott James Remnant <[e-mail]>  Tue, 28 Nov 2006 15:24:16 +0000
+
 multipath-tools (0.4.7-1.1) unstable; urgency=medium
 
   * Added missing dependency on dmsetup.  Closes: #381068.
@@ -971,6 +2283,77 @@ multipath-tools (0.4.7-1.1) unstable; urgency=medium
 
  -- John Goerzen <[e-mail]>  Wed,  9 Aug 2006 11:52:08 -0500
 
+multipath-tools (0.4.7-1ubuntu8) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 15 Sep 2006 17:30:19 +0100
+
+multipath-tools (0.4.7-1ubuntu7) dapper; urgency=low
+
+  * Fix typo in init script that was executing hsg80_init unconditionally.
+
+  * Suggests: sg3-utils and Conflicts: sg-utils (obsoleted).
+
+ -- Fabio M. Di Nitto <[e-mail]>  Mon, 22 May 2006 09:56:07 +0200
+
+multipath-tools (0.4.7-1ubuntu6) dapper; urgency=low
+
+  * no changes upload to rebuild with new libdevmapper.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 10 May 2006 09:31:20 +0200
+
+multipath-tools (0.4.7-1ubuntu5) dapper; urgency=low
+
+  The "give Scott a crying biscuit" release.
+
+  * Apply patch from Dennis Kaarsemaker.
+  (Closes Ubuntu: #41318)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 26 Apr 2006 10:20:07 +0200
+
+multipath-tools (0.4.7-1ubuntu4) dapper; urgency=low
+
+  * Remove 2 extra lines from multipath.rules that were really not supposed
+    to be there.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 06 Apr 2006 17:43:10 +0200
+
+multipath-tools (0.4.7-1ubuntu3) dapper; urgency=low
+
+  * Add hsg80_init function to multipath-tools-boot init script.
+    The script takes care to perform a proper initialization of the disks
+    when the hsg80 is configured in multibus failover mode.
+
+    NOTE: multipathd is not able to understand properly what happens in this
+    multi-bugs situation and it will require manual kill and restart once
+    the disks have been readded to the system, otherwise failover is not
+    guaranteed and syslog will be flooded.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 06 Apr 2006 09:33:51 +0200
+
+multipath-tools (0.4.7-1ubuntu2) dapper; urgency=low
+
+  * Fix socket permissions.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 04 Apr 2006 18:20:20 +0200
+
+multipath-tools (0.4.7-1ubuntu1) dapper; urgency=low
+
+  * Fix path to scsi_id.
+
+  * Make install: target depends on build in debian/rules.
+
+  * Change NAME to multipathd in init scripts so that we can actually stop
+    multipathd.
+
+  * Swap multipath-tools-boot and multipath-tools init scripts order in
+    postinst and make multipath-tools-boot start.
+
+  * UVF exception granted by Colin Watson.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 04 Apr 2006 06:31:09 +0200
+
 multipath-tools (0.4.7-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 3ba2999..7896144 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: multipath-tools
 Section: admin
 Priority: optional
-Maintainer: Debian DM Multipath Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian DM Multipath Team <[e-mail]>
 Uploaders: Guido Günther <[e-mail]>, Ritesh Raj Sarraf <[e-mail]>, Chris Hofstaedtler <[e-mail]>
 Build-Depends: debhelper (>= 9.20160709), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, libaio-dev, dpkg-dev (>= 1.16.1~), libudev-dev, libsystemd-dev, systemd, liburcu-dev, pkg-config, libjson-c-dev
 Vcs-Git: https://salsa.debian.org/linux-blocks-team/multipath-tools.git
@@ -30,10 +31,18 @@ Description: create device mappings for partitions
  Kpartx can be used to set up device mappings for the partitions of any
  partitioned block device. It is part of the Linux multipath-tools.
 
+Package: kpartx-boot
+Architecture: all
+Depends: ${misc:Depends}, initramfs-tools,
+ kpartx (>= ${source:Version}), kpartx (<< ${source:Version}.1~)
+Description: Provides kpartx during boot
+ This package makes kpartx available during boot to activate partitions
+
 Package: multipath-tools-boot
 Architecture: all
 Depends: ${misc:Depends}, initramfs-tools | linux-initramfs-tool, lsb-base (>= 3.0-6),
- multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~)
+ multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~),
+ kpartx-boot (= ${binary:Version})
 Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.5.0+git1.656f8865-6)
 Breaks: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.5.0+git1.656f8865-6)
 Description: Support booting from multipath devices
@@ -48,8 +57,8 @@ Description: Support booting from multipath devices
 
 Package: multipath-udeb
 Package-Type: udeb
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules, kpartx-udeb
+Architecture: amd64 arm64 armhf ppc64el s390x
+Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules, kpartx-udeb, sg3-udeb
 Section: debian-installer
 Description: maintain multipath block device access - udeb package
  This is a udeb, or a microdeb, for the debian-installer.
@@ -59,7 +68,7 @@ Description: maintain multipath block device access - udeb package
 
 Package: kpartx-udeb
 Package-Type: udeb
-Architecture: linux-any
+Architecture: amd64 arm64 armhf ppc64el s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: debian-installer
 Description: create device mappings for partitions - udeb package
diff --git a/debian/initramfs/hooks b/debian/initramfs/hooks
index 6a1dd88..126781b 100644
--- a/debian/initramfs/hooks
+++ b/debian/initramfs/hooks
@@ -30,9 +30,17 @@ add_bindings()
   fi
 }
 
+add_wwids()
+{
+  if [ -r /etc/multipath/wwids ]; then
+      mkdir -p $DESTDIR/etc/multipath
+      cp /etc/multipath/wwids $DESTDIR/etc/multipath
+  fi
+}
+
 add_udev_rules()
 {
-  for rules in 60-multipath.rules 60-kpartx.rules; do
+  for rules in 60-multipath.rules 56-dm-mpath.rules; do
     if [ -e /lib/udev/rules.d/$rules ]; then
       cp -p /lib/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
     fi
@@ -48,12 +56,24 @@ mkdir -p $DESTDIR/lib/multipath/
 for x in /lib/multipath/*; do
     copy_exec $x /lib/multipath/
 done
+copy_exec /usr/bin/partx
 add_udev_rules
 
+copy_exec /sbin/multipathd 		/sbin
+# multipathd requires libgcc_s.so.1 (not handled by copy_exec() as it's dlopen()'ed).
+# hack: find libgcc_s.so.1 via ldconfig cache (dpkg-architecture pulls lots of deps).
+for x in $(ldconfig --print-cache | grep -o '/lib/.*/libgcc_s\.so\.1'); do
+    copy_exec $x $(dirname $x)
+done
+
+# multipathd requires /run/multipathd.pid
+mkdir -p $DESTDIR/run
+
 [ -r /etc/multipath.conf ] && cp /etc/multipath.conf $DESTDIR/etc/
 add_bindings
+add_wwids
 
-for x in dm-multipath dm-service-time dm-round-robin; do
+for x in dm-multipath dm-service-time dm-round-robin dm-queue-length; do
 	manual_add_modules ${x}
 done
 
diff --git a/debian/initramfs/init-top b/debian/initramfs/init-top
index 51637e9..883d7f9 100644
--- a/debian/initramfs/init-top
+++ b/debian/initramfs/init-top
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# multipath hardware handler
+# multipath: load modules and daemon
 
 PREREQ=" "
 
@@ -26,7 +26,18 @@ verbose()
 
 maybe_break pre-multipath
 VERBOSITY=0
-HW_HANDLERS=""
+HW_HANDLERS="scsi_dh_alua scsi_dh_rdac scsi_dh_emc"
+MP_MODULES="dm-multipath"
+
+verbose && log_begin_msg "Loading multipath modules"
+for module in ${MP_MODULES}; do
+  if modprobe --syslog "$module"; then
+    verbose && log_success_msg "loaded module ${module}."
+  else
+    log_failure_msg "failed to load module ${module}."
+  fi
+done
+verbose && log_end_msg
 
 verbose && log_begin_msg "Loading multipath hardware handlers"
 for module in ${HW_HANDLERS}; do
@@ -38,6 +49,11 @@ for module in ${HW_HANDLERS}; do
 done
 verbose && log_end_msg
 
+# Start multipathd
+verbose && log_begin_msg "Starting multipathd"
+/sbin/multipathd -B
+verbose && log_end_msg
+
 maybe_break post-multipath
 
 exit 0
diff --git a/debian/initramfs/kpartx.hook b/debian/initramfs/kpartx.hook
new file mode 100644
index 0000000..404f977
--- /dev/null
+++ b/debian/initramfs/kpartx.hook
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+PREREQS="udev"
+
+prereqs() { echo "$PREREQS"; }
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /sbin/kpartx /sbin
+copy_exec /sbin/dmsetup			/sbin
+copy_exec /lib/udev/dmsetup_env		/lib/udev
+copy_exec /lib/udev/kpartx_id		/lib/udev
+cp -p /lib/udev/rules.d/56-dm-parts.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/68-del-part-nodes.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/95-kpartx.rules $DESTDIR/lib/udev/rules.d/
diff --git a/debian/initramfs/local-top b/debian/initramfs/local-bottom
similarity index 56%
rename from debian/initramfs/local-top
rename to debian/initramfs/local-bottom
index 560ac2d..13026ff 100644
--- a/debian/initramfs/local-top
+++ b/debian/initramfs/local-bottom
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# multipath discovery
+# multipathd shutdown
 
-PREREQ="udev iscsi"
+PREREQ=""
 
 prereqs() { echo "$PREREQ"; }
 
@@ -25,34 +25,36 @@ verbose()
 }
 
 maybe_break pre-multipath
-VERBOSITY=0
-MP_MODULES="scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath"
 
-if [ ! -e /sbin/multipath ]; then
+if [ ! -e /sbin/multipathd ]; then
 	exit 0
 fi
 
-verbose && log_begin_msg "Loading multipath modules"
-for module in ${MP_MODULES}; do
-  if modprobe "$module"; then
-    verbose && log_success_msg "loaded module ${module}."
-  else
-    log_failure_msg "failed to load module ${module}."
-  fi
-done
-verbose && log_end_msg
+# Stop multipathd
+verbose && log_begin_msg "Stopping multipathd"
 
-verbose && log_begin_msg "Discovering multipaths"
-/sbin/multipath -v $VERBOSITY
-verbose && log_end_msg
+pid_pidof="$(pidof multipathd)"
+pid_file="$(cat /run/multipathd.pid)"
 
-if [ -x /sbin/kpartx -a -x /sbin/dmsetup ]; then
-    /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p -part" >/dev/null
+if [ "${pid_pidof}" = "${pid_file}" ]; then
+	kill ${pid_pidof}
+	verbose && log_end_msg
+else
+	verbose && log_failure_msg "inconsistent PIDs (pidof: '${pid_pidof}', multipathd.pid: '${pid_file}')"
 fi
 
-if [ -x /bin/udevadm ]; then
-    /bin/udevadm settle --timeout=10
-fi
+# Wait for multipathd unix socket to close.
+# It might take a while for multipathd to handle the signal,
+# which might leave the unix socket open until the upcoming
+# systemd multipath.socket unit starts.  Then it fails with
+# (Result: resources) like this (logs in journalctl):
+# "Failed to listen on sockets: Address already in use"
+seconds=10
+while [ $seconds -gt 0 ]; do
+	grep -q '@/org/kernel/linux/storage/multipathd' /proc/net/unix || break
+	seconds=$((seconds - 1))
+	sleep 1
+done
 
 maybe_break post-multipath
 
diff --git a/debian/initramfs/local-premount b/debian/initramfs/local-premount
new file mode 100644
index 0000000..050f97b
--- /dev/null
+++ b/debian/initramfs/local-premount
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+. /scripts/functions
+
+if [ -x /sbin/multipath ]
+then
+	[ "$quiet" != "y" ] && log_begin_msg "Waiting for udev to settle (multipath)"
+	udevadm settle --timeout=121 || true
+	[ "$quiet" != "y" ] && log_end_msg
+fi
+
+multipath -r -v0 -B
+
+exit 0
diff --git a/debian/kpartx-boot.postinst b/debian/kpartx-boot.postinst
new file mode 100644
index 0000000..6257dc3
--- /dev/null
+++ b/debian/kpartx-boot.postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+# postinst script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/kpartx-boot.postrm b/debian/kpartx-boot.postrm
new file mode 100644
index 0000000..daca462
--- /dev/null
+++ b/debian/kpartx-boot.postrm
@@ -0,0 +1,45 @@
+#!/bin/sh
+# postrm script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/kpartx.install b/debian/kpartx.install
index eb9431e..c69cb2b 100644
--- a/debian/kpartx.install
+++ b/debian/kpartx.install
@@ -1,4 +1,4 @@
 /usr/share/man/man8/kpartx.8.gz
 /sbin/kpartx
-/lib/udev/kpartx_id
-/lib/udev/dmsetup_env
+/lib*/udev/kpartx_id
+/lib*/udev/dmsetup_env
diff --git a/debian/multipath-tools.dm-mpath-lvm.udev b/debian/multipath-tools.dm-mpath-lvm.udev
new file mode 100644
index 0000000..4698023
--- /dev/null
+++ b/debian/multipath-tools.dm-mpath-lvm.udev
@@ -0,0 +1,26 @@
+# An individual device may be part of a multipath device.
+# In such case, remove its partition device nodes so for
+# LVM to scan/lock/use only the multipath device.
+# - Check it on 'add' uevent.
+# - Check it on 'change' uevent (it may change).
+
+SUBSYSTEM!="block", \
+	GOTO="end_mpath"
+
+ACTION=="remove", \
+	GOTO="end_mpath"
+
+ENV{DEVTYPE}=="partition", \
+	IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH", \
+	GOTO="end_mpath"
+
+PROGRAM=="/sbin/multipath -u $devnode", \
+	ENV{DM_MULTIPATH_DEVICE_PATH}="1", \
+	ENV{ID_FS_TYPE}="mpath_member", \
+	RUN+="/usr/bin/partx -d --nr 1-1024 $devnode", \
+	GOTO="end_mpath"
+
+# Not part of a multipath device.
+ENV{DM_MULTIPATH_DEVICE_PATH}=""
+
+LABEL="end_mpath"
diff --git a/debian/multipath-tools.install b/debian/multipath-tools.install
index d857eba..6f27789 100644
--- a/debian/multipath-tools.install
+++ b/debian/multipath-tools.install
@@ -14,3 +14,4 @@
 /usr/include/libdmmp/libdmmp.h
 /lib/systemd/system/multipathd.service
 /lib/systemd/system/multipathd.socket
+/etc/multipath.conf
diff --git a/debian/multipath-tools.preinst b/debian/multipath-tools.preinst
index 50f8864..74419d2 100644
--- a/debian/multipath-tools.preinst
+++ b/debian/multipath-tools.preinst
@@ -32,6 +32,10 @@ case "$1" in
     ;;
 esac
 
+if ! dmsetup targets | cut -d' ' -f1 | grep -q '^multipath$'; then
+  modprobe -v dm-multipath || true
+fi
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/multipath-udeb.install b/debian/multipath-udeb.install
index 672c3c8..e6794f5 100644
--- a/debian/multipath-udeb.install
+++ b/debian/multipath-udeb.install
@@ -2,3 +2,4 @@
 /lib/multipath/
 /lib/libmultipath.so.*
 /lib/libmpathcmd.so*
+/etc/multipath.conf
\ No newline at end of file
diff --git a/debian/multipath.conf b/debian/multipath.conf
new file mode 100644
index 0000000..d19039f
--- /dev/null
+++ b/debian/multipath.conf
@@ -0,0 +1,3 @@
+defaults {
+    user_friendly_names yes
+}
diff --git a/debian/patches/disable-fexceptions-udeb.patch b/debian/patches/disable-fexceptions-udeb.patch
new file mode 100644
index 0000000..ba95006
--- /dev/null
+++ b/debian/patches/disable-fexceptions-udeb.patch
@@ -0,0 +1,17 @@
+From: Mauricio Faria de Oliveira <[e-mail]>
+Subject: Make the use of -fexceptions conditional.
+Last-Update: 2019-04-29
+
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -106,6 +106,10 @@ SHARED_FLAGS	= -shared
+ LDFLAGS		= $(shell dpkg-buildflags --get LDFLAGS)
+ BIN_LDFLAGS	= -pie
+ 
++ifdef CFLAGS_DISABLE_FEXCEPTIONS
++	CFLAGS := $(filter-out -fexceptions,$(CFLAGS))
++endif
++
+ # Check whether a function with name $1 has been declared in header file $2.
+ check_func = $(shell \
+ 	if grep -Eq "^[^[:blank:]]+[[:blank:]]+$1[[:blank:]]*(.*)*" "$2"; then \
diff --git a/debian/patches/enable-find-multipaths.patch b/debian/patches/enable-find-multipaths.patch
new file mode 100644
index 0000000..68e75f2
--- /dev/null
+++ b/debian/patches/enable-find-multipaths.patch
@@ -0,0 +1,17 @@
+From: Mauricio Faria de Oliveira <[e-mail]>
+Date: Thu, 25 Jan 2018 12:02:55 +0100
+Subject: enable find multipaths
+
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1463046
+--- a/libmultipath/defaults.h
++++ b/libmultipath/defaults.h
+@@ -17,7 +17,7 @@
+ #define DEFAULT_NO_PATH_RETRY	NO_PATH_RETRY_UNDEF
+ #define DEFAULT_VERBOSITY	2
+ #define DEFAULT_REASSIGN_MAPS	0
+-#define DEFAULT_FIND_MULTIPATHS	FIND_MULTIPATHS_STRICT
++#define DEFAULT_FIND_MULTIPATHS	FIND_MULTIPATHS_ON
+ #define DEFAULT_FAST_IO_FAIL	5
+ #define DEFAULT_DEV_LOSS_TMO	600
+ #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
diff --git a/debian/patches/kpartx-Improve-finding-loopback-device-by-file.patch b/debian/patches/kpartx-Improve-finding-loopback-device-by-file.patch
new file mode 100644
index 0000000..01de7ab
--- /dev/null
+++ b/debian/patches/kpartx-Improve-finding-loopback-device-by-file.patch
@@ -0,0 +1,70 @@
+From f2bd34f273a02c0ed12e996ebe57211576e40fa6 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Mon, 5 Feb 2018 09:44:36 +0100
+Subject: [PATCH] kpartx: Improve finding loopback device by file
+
+Commit 9bdfa3eb8e24b668e6c2bb882cddb0ccfe23ed5b changed kpartx
+to lookup files by absolute path, using realpath(). This introduced
+a regression when part of the filename where symbolic links. While
+the kernel stores the absolute path to the backing file, it does not
+resolve symbolic links, and hence kpartx would fail to find the loopback
+device because it resolves symbolic links when deleting.
+
+This introduces two workarounds in find_loop_by_file()
+
+(1) We match against the specified file name as is as well
+(2) We canonicalize the loopinfo.lo_name and match the canonicalized filename
+    against that.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/1747044
+Signed-off-by: Julian Andres Klode <[e-mail]>
+Forwarded: https://www.redhat.com/archives/dm-devel/2018-February/msg00019.html
+---
+ kpartx/kpartx.c |  8 +-------
+ kpartx/lopart.c | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -330,10 +330,10 @@ main(int argc, char **argv){
+ 		char rpath[PATH_MAX];
+ 		if (realpath(device, rpath) == NULL) {
+ 			fprintf(stderr, "Error: %s: %s\n", device,
+-				strerror(errno));
++			strerror(errno));
+ 			exit (1);
+ 		}
+-		loopdev = find_loop_by_file(rpath);
++		loopdev = find_loop_by_file(device);
+ 
+ 		if (!loopdev && what == DELETE)
+ 			exit (0);
+--- a/kpartx/lopart.c
++++ b/kpartx/lopart.c
+@@ -69,6 +69,14 @@ char *find_loop_by_file(const char *file
+ 	struct loop_info loopinfo;
+ 	const char VIRT_BLOCK[] = "/sys/devices/virtual/block";
+ 	char path[PATH_MAX];
++	char rfilename[PATH_MAX];
++	char rloopfilename[PATH_MAX];
++	if (realpath(filename, rfilename) == NULL) {
++		fprintf(stderr, "Error: %s: %s\n", filename,
++				strerror(errno));
++		exit (1);
++	}
++
+ 	char bf_path[PATH_MAX];
+ 	char backing_file[PATH_MAX];
+ 
+@@ -120,7 +128,10 @@ char *find_loop_by_file(const char *file
+ 
+ 		close (fd);
+ 
+-		if (0 == strcmp(filename, loopinfo.lo_name)) {
++		if (0 == strcmp(filename, loopinfo.lo_name) ||
++		    0 == strcmp(rfilename, loopinfo.lo_name) ||
++		    (realpath(loopinfo.lo_name, rloopfilename) &&
++		     0 == strcmp(rfilename, rloopfilename))) {
+ 			found = realpath(path, NULL);
+ 			break;
+ 		}
diff --git a/debian/patches/kpartx-print-loop-deleted-to-stdout-not-stderr.patch b/debian/patches/kpartx-print-loop-deleted-to-stdout-not-stderr.patch
new file mode 100644
index 0000000..8c81a5b
--- /dev/null
+++ b/debian/patches/kpartx-print-loop-deleted-to-stdout-not-stderr.patch
@@ -0,0 +1,33 @@
+From dc2cd8f1c7d910d98e2046fd096a5eb67a8e9b9a Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Mon, 5 Feb 2018 11:34:14 +0100
+Subject: [PATCH] kpartx: print "loop deleted" to stdout, not stderr
+
+Commit fa643f5d2590028a59c671b81ab41383806fd258 moved some
+code around and changed the print for loop deleted from stdout
+to stderr - but this is not an error message, and also printed
+to stdout in another place, so let's just use printf() again
+here.
+
+Signed-off-by: Julian Andres Klode <[e-mail]>
+Forwarded: https://www.redhat.com/archives/dm-devel/2018-February/msg00021.html
+---
+ kpartx/kpartx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
+index c1af1c5e..2e882721 100644
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -399,7 +399,7 @@ main(int argc, char **argv){
+ 					       loopdev);
+ 				r = 1;
+ 			} else
+-				fprintf(stderr, "loop deleted : %s\n", loopdev);
++				printf("loop deleted : %s\n", loopdev);
+ 		}
+ 		goto end;
+ 	}
+-- 
+2.15.1
+
diff --git a/debian/patches/kpartx_more_loopback_fixes.patch b/debian/patches/kpartx_more_loopback_fixes.patch
new file mode 100644
index 0000000..a0a3105
--- /dev/null
+++ b/debian/patches/kpartx_more_loopback_fixes.patch
@@ -0,0 +1,40 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Fix kpartx some more to correctly remove loopback devices on delete.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/1543430
+
+Loop devices get created when using kpartx with an image file, but should be
+removed afterwards when using kpartx -d. Unfortunately, the devmapper maps
+did get removed but not the losetup nodes behind it, which were still bound
+to the image file. This is because we re-stat the loop device once we've
+figured which one to use, since otherwise we wouldn't have major and minor
+numbers for a loopback file; yet we need those to create the devmapper maps
+reliably.
+
+Instead of checking if we're dealing with a regular type file (since after
+stat() we'd not have the S_ISREG check succeed since we stat()'ed a device),
+use the loopdev variable. It's equivalent to device but only set if we've been
+called to work on an image.
+
+*update*
+This got partially upstream with the following patch - maybe we can drop it now?:
+commit ed4c3119cc1d6bc6656cf84d1e9c1ab184d87814
+Author: Christian Kastner <[e-mail]>
+Date:   Wed Jul 13 19:23:02 2016 +0200
+    kpartx: Fix check whether to detach loop device
+
+
+---
+ kpartx/kpartx.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -646,7 +646,7 @@ main(int argc, char **argv){
+ 		if (n > 0)
+ 			break;
+ 	}
+-	if (what == LIST && loopcreated && S_ISREG (buf.st_mode)) {
++	if (what == LIST && loopcreated && loopdev) {
+ 		if (fd != -1)
+ 			close(fd);
+ 		if (del_loop(device)) {
diff --git a/debian/patches/no-start-in-containers.patch b/debian/patches/no-start-in-containers.patch
new file mode 100644
index 0000000..5e8dc59
--- /dev/null
+++ b/debian/patches/no-start-in-containers.patch
@@ -0,0 +1,17 @@
+Description: Do not attempt to start multipath-tools in containers,
+ should switch for on-demand udev/socket based activation in the
+ future.
+Author: Dimitri John Ledkov <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1823093
+
+
+--- multipath-tools-0.7.4.orig/multipathd/multipathd.service
++++ multipath-tools-0.7.4/multipathd/multipathd.service
+@@ -8,6 +8,7 @@ DefaultDependencies=no
+ Conflicts=shutdown.target
+ ConditionKernelCommandLine=!nompath
+ ConditionKernelCommandLine=!multipath=off
++ConditionVirtualization=!container
+ 
+ [Service]
+ Type=notify
diff --git a/debian/patches/series b/debian/patches/series
index d25bc39..76f21e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,9 @@ disable-systemd-for-udeb.patch
 fix-usrmerge-paths.patch
 11-dm-mpath-fix-DM_UDEV_RULES_VSN-check.patch
 enable-cross-build.patch
+disable-fexceptions-udeb.patch
+kpartx_more_loopback_fixes.patch
+enable-find-multipaths.patch
+kpartx-Improve-finding-loopback-device-by-file.patch
+kpartx-print-loop-deleted-to-stdout-not-stderr.patch
+no-start-in-containers.patch
diff --git a/debian/rules b/debian/rules
index ff44b73..30be182 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,13 @@ else
         INSTALL_PROGRAM = install
 endif
 
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),i386)
+        ADD_UDEB = --no-add-udeb
+	skip_packages = -Nmultipath-tools
+else
+        ADD_UDEB = --add-udeb=multipath-udeb
+endif
+
 # For Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -43,7 +50,7 @@ build-stamp: clean-tree
 build-multipath-udeb-stamp:
 	dh_testdir
 
-	DEB_CFLAGS_MAINT_APPEND="-static-libgcc" dh_auto_build -- $(OPTFLAGS) LIB=/lib USE_SYSTEMD=0
+	DEB_CFLAGS_MAINT_APPEND="-static-libgcc" CFLAGS_DISABLE_FEXCEPTIONS=1 dh_auto_build -- $(OPTFLAGS) LIB=/lib USE_SYSTEMD=0
 	
 	# store files for install target
 	mkdir -p $(CURDIR)/debian/tmp-multipath-udeb/sbin
@@ -71,8 +78,11 @@ install-indep:
 
 	# initramfs stuff:
 	install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/multipath
-	install -D -m 755 debian/initramfs/local-top \
-		$(INITRAMFS)/scripts/local-top/multipath
+	install -D -m 755 debian/initramfs/kpartx.hook $(CURDIR)/debian/kpartx-boot/usr/share/initramfs-tools/hooks/kpartx
+	install -D -m 755 debian/initramfs/local-premount \
+		$(INITRAMFS)/scripts/local-premount/multipath
+	install -D -m 755 debian/initramfs/local-bottom \
+		$(INITRAMFS)/scripts/local-bottom/multipath
 	install -D -m 755 debian/initramfs/init-top \
 		$(INITRAMFS)/scripts/init-top/multipath
 
@@ -94,6 +104,8 @@ install: install-indep
 	mkdir -p $(CURDIR)/debian/tmp/sbin
 	$(MAKE) install INSTALL_PROGRAM=$(INSTALL_PROGRAM) DESTDIR=$(CURDIR)/debian/tmp LIB=/lib SYSTEMDPATH=/lib USE_SYSTEMD=1
 	install -m 755 debian/dmsetup_env $(CURDIR)/debian/tmp/lib/udev/
+	mkdir -p $(CURDIR)/debian/tmp/etc
+	cp debian/multipath.conf $(CURDIR)/debian/tmp/etc
 	dh_install -X.rules --fail-missing -Nmultipath-udeb --sourcedir=$(CURDIR)/debian/tmp
 	dh_install -Xkpartx_id -X.rules -X.service -X.socket --fail-missing -pmultipath-udeb --sourcedir=$(CURDIR)/debian/tmp-multipath-udeb
 
@@ -125,7 +137,7 @@ binary-arch: build install
 	dh_lintian -a
 	dh_systemd_enable -pmultipath-tools multipathd.service
 	dh_installinit -pmultipath-tools
-	dh_installudev -pkpartx
+	dh_installudev -pkpartx --priority=95
 	dh_installudev -pkpartx --name=dm-parts --priority=56
 	dh_installudev -pkpartx --name=del-part-nodes --priority=68
 	dh_installudev -pmultipath-tools --name=multipath
@@ -134,16 +146,16 @@ binary-arch: build install
 		lib/systemd/system/multipath-tools.service
 	dh_systemd_start -pmultipath-tools multipathd.service
 	dh_installman -a
-	dh_makeshlibs -a --add-udeb=multipath-udeb
+	dh_makeshlibs -a $(ADD_UDEB)
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a
+	dh_gencontrol -a $(skip_packages)
 	dh_md5sums -a
-	dh_builddeb -a
+	dh_builddeb -a $(skip_packages)
 
 binary:	binary-indep binary-arch
 .PHONY: binary binary-arch binary-indep unpack configure build clean 
diff --git a/debian/tests/tgtbasedmpaths b/debian/tests/tgtbasedmpaths
index b5dcebe..432aba6 100755
--- a/debian/tests/tgtbasedmpaths
+++ b/debian/tests/tgtbasedmpaths
@@ -15,8 +15,8 @@ localhost="127.0.0.1"
 portal="${localhost}:3260"
 maxpaths=4
 backfn="backingfile"
-expectwwid="360000000000000000e00000000010001"
-testdisk="/dev/disk/by-id/scsi-${expectwwid}"
+expectwwid="60000000000000000e00000000010001"
+testdisk="/dev/disk/by-id/wwn-0x${expectwwid}"
 bglog="$AUTOPKGTEST_ARTIFACTS/test-background.log"
 fioprep="$AUTOPKGTEST_ARTIFACTS/path-change-prep.fio"
 fiovrfy="$AUTOPKGTEST_ARTIFACTS/path-change-check.fio"
@@ -48,6 +48,7 @@ do
 done
 
 udevadm settle
+sleep 5         # sleep a bit to allow device to be created....
 
 # status summary
 echo "Status after initial setup"