diff --git a/debian/changelog b/debian/changelog
index efacb06..b1e103a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+multipath-tools (0.9.4-5ubuntu1) mantic; urgency=medium
+
+ * Merge with Debian unstable (LP: #2018051). Remaining changes:
+   - d/p/enable-find-multipaths.patch: re-enable find_multipaths by
+     default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+   - d/multipath.conf: Install friendly names multipath.conf by default,
+     instead of generating it in every installer.
+   - d/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+     for new udev rules
+   - 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).
+     + remove d/initramfs/local-top
+   - d/initramfs/hooks: Add dm-queue-length: users may want to
+     change from the default selector and should be able to do so.
+     (LP 1673350)
+   - 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)
+   - debian/initramfs/local-bottom: wait for the multipathd unix 
+     socket to close, so to avoid multipathd.socket unit failure.
+     (LP 1682178)
+   - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
+     + d/kpartx-initramfs/hooks/kpartx
+     + d/kpartx-boot.install
+     + d/kpartx-boot.postinst
+     + d/kpartx-boot.postrm
+     + d/control: Add kpartx-boot package for dmraid
+   - d/rules: Move udev rules to priority 95, because rules that load 
+     modules should be >90. 
+   - Don't build the multipath-tools binary package on i386; only kpartx.
+ * Dropped changes:
+   - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+     finding loopback devices (LP 1747044)
+     [ Dropping due to LP: 1961633 ]
+   - d/rules: copy udev rule after build.
+     [ udeb copied after build in debian now ]
+   - d/multipath-tools.install: install tmpfiles.d/multipath.conf
+     [ Included in debian now ]
+   - SECURITY UPDATE: symlink attack CVE-2022-41973
+     [ Applied upstream in 0.9.4 ]
+   - SECURITY UPDATE: authorization bypass CVE-2022-41974
+     [ Applied upstream in 0.9.4 ]
+ * Added changes:
+   - d/rules: do not install init scripts (LP: #2000186)
+   - d/rules: remove -Bsymbolic-functions from LDFLAGS (LP: #<FIXME-bugnum>)
+   - Fix (LP: #2026881) (included in upstream)
+
+ -- Mitchell Dzurick <mitchell.dzurick@canonical.com>  Mon, 17 Jul 2023 10:04:12 -0700
+
 multipath-tools (0.9.4-5) unstable; urgency=medium
 
   * [7578bfb] Fail package build if udev rules are missing
@@ -109,6 +172,109 @@ multipath-tools (0.9.0-1) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Fri, 29 Jul 2022 22:02:31 +0000
 
+multipath-tools (0.8.8-1ubuntu2) lunar; urgency=medium
+
+  * SECURITY UPDATE: symlink attack
+    - debian/patches/CVE-2022-41973.patch: use /run instead of /dev/shm in
+      .gitignore, Makefile.inc, libmultipath/defaults.h,
+      multipath/Makefile, multipath/multipath.rules.in,
+      multipath/tmpfiles.conf.in.
+    - debian/multipath-tools.install: install tmpfiles.d/multipath.conf.
+    - debian/rules: copy udev rule after build.
+    - CVE-2022-41973
+  * SECURITY UPDATE: authorization bypass
+    - debian/patches/CVE-2022-41974-pre1.patch: fix command completion in
+      interactive mode in multipathd/callbacks.c, multipathd/cli.c,
+      multipathd/cli_handlers.c, multipathd/main.c.
+    - debian/patches/CVE-2022-41974.patch: more robust command parsing in
+      multipathd/callbacks.c, multipathd/cli.c, multipathd/cli.h,
+      multipathd/cli_handlers.c, multipathd/uxlsnr.c.
+    - debian/patches/CVE-2022-41974-2.patch: fix command completion with
+      robust parser in multipathd/cli.c, multipathd/cli.h,
+      multipathd/uxlsnr.c.
+    - debian/patches/CVE-2022-41974-3.patch: add test for command parsing
+      in Makefile.inc, tests/Makefile, tests/cli.c, multipathd/cli.h,
+      multipathd/cli.c.
+    - debian/patches/CVE-2022-41974-4.patch: fix memory leak handling
+      invalid commands in multipathd/uxlsnr.c.
+    - CVE-2022-41974
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 28 Oct 2022 14:43:41 -0400
+
+multipath-tools (0.8.8-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946834, #1961136). Remaining changes:
+    - d/p/enable-find-multipaths.patch: re-enable find_multipaths by
+      default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - 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)
+    - 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
+    - debian/initramfs/local-bottom: wait for the multipathd unix
+      socket to close, so to avoid multipathd.socket unit failure.
+      (LP 1682178)
+    - 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/rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - Don't build the multipath-tools binary package on i386; we only want
+      kpartx.
+  * Dropped changes:
+    - Use stable wwn-* names in autopkgtest that work with or without
+      friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+      [ Included in 0.8.8-1 ]
+    - debian/tests/tgtbasedmpaths: Add sleep to allow for device creation
+      [ Included in 0.8.8-1 ]
+    - 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)
+      [ Applied upstream in 0.8.6 ]
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+      [ Applied upstream in 0.8.7 ]
+    - d/t/control: use allow-stderr for kpartx-file-loopback, the new
+      gdisks version displays warnings on stderr now.
+      [ Fixed in 0.8.8-1 ]
+  * Added changes:
+    - d/t/kpartx-file-loopback: silence kpartx messages to stderr
+    - d/rules: remove -Bsymbolic-functions from LDFLAGS
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Mon, 21 Feb 2022 18:18:27 -0300
+
 multipath-tools (0.8.8-1) unstable; urgency=medium
 
   [ Utkarsh Gupta ]
@@ -130,6 +296,116 @@ multipath-tools (0.8.8-1) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Sun, 16 Jan 2022 22:57:28 +0000
 
+multipath-tools (0.8.5-2ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild against liburcu8
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 08 Nov 2021 01:14:39 +0000
+
+multipath-tools (0.8.5-2ubuntu2) impish; urgency=medium
+
+  * Don't build the multipath-tools binary package on i386; we
+    only want kpartx.
+
+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com>  Wed, 07 Jul 2021 14:49:31 +0530
+
+multipath-tools (0.8.5-2ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Use stable wwn-* names in autopkgtest that work with or without
+      friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+    - debian/tests/tgtbasedmpaths: Add sleep to allow for device creation
+    - patches to multipath source:
+      - 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)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - 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)
+    - 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
+    - debian/initramfs/local-bottom: wait for the multipathd unix
+      socket to close, so to avoid multipathd.socket unit failure.
+      (LP 1682178)
+    - 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/rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - debian/test/control:
+      - use allow-stderr for kpartx-file-loopback, the new gdisks version
+        displays warnings on stderr now
+  * Dropped changes:
+    - [Undocumented] d/p/newer-jsonc.patch: drop this patch since this
+      was added in v0.8.4-2ubuntu1 as a delta but was incorporated in
+      Debian via v0.8.4-3 with a different name (jsonc-true.patch; cf:
+      https://bugs.debian.org/966597) and was never dropped from here
+      and we've been carrying this since then.
+      [Included in 0.8.4-3]
+    - Drop depends on udebs, such that they don't hold up any other udebs
+      in the archive, especially kernel udebs. Otherwise unused in Ubuntu.
+      [Dropped support for udebs]
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+      [Dropped support for udebs]
+    - d/control, d/rules: i386 related fixes
+      - 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.
+      [Dropped support for i386 & udebs]
+    - d/control: multipath-udeb: add sg3-udeb Depends
+      [Dropped support for udebs]
+    - d/kpartx.install: install all arch /lib* kpartx udev rules
+      [There's no "/lib*" anymore]
+    - d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+      [Upstream denied the patch; unneeded]
+    - 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.
+      [Changes aren't relevant anymore; dropped support for udebs]
+
+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com>  Mon, 21 Jun 2021 23:06:33 +0530
+
 multipath-tools (0.8.5-2) unstable; urgency=medium
 
   * [373f5c5] Fix bashism in script kpartx/kpartx_id.
@@ -137,6 +413,106 @@ multipath-tools (0.8.5-2) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  Wed, 28 Apr 2021 22:40:55 +0530
 
+multipath-tools (0.8.5-1ubuntu6) hirsute; urgency=medium
+
+  * debian/test/control:
+    - use allow-stderr for kpartx-file-loopback, the new gdisks version
+      displays warnings on stderr now
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 04 Mar 2021 12:20:20 +0100
+
+multipath-tools (0.8.5-1ubuntu5) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Feb 2021 10:35:31 +0100
+
+multipath-tools (0.8.5-1ubuntu4) hirsute; urgency=medium
+
+  * Drop depends on udebs, such that they don't hold up any other udebs in
+    the archive, especially kernel udebs. Otherwise unused in Ubuntu.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 08 Feb 2021 13:18:26 +0000
+
+multipath-tools (0.8.5-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - 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
+    - d/control: multipath-udeb: add sg3-udeb Depends
+    - patches to multipath source:
+      - 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)
+    - 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
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+    - d/control, d/rules: i386 related fixes
+      - 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.
+    - 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/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - d/rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - 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
+      - Use stable wwn-* names in autopkgtest that work with or without
+        friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 25 Dec 2020 22:51:36 +0100
+
 multipath-tools (0.8.5-1) unstable; urgency=medium
 
   [ Ritesh Raj Sarraf ]
@@ -162,6 +538,94 @@ multipath-tools (0.8.5-1) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Wed, 23 Dec 2020 23:53:53 +0000
 
+multipath-tools (0.8.4-4ubuntu2) groovy; urgency=medium
+
+  * Add README.alua to docs section
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Fri, 11 Sep 2020 17:39:12 +0000
+
+multipath-tools (0.8.4-4ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - 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
+    - d/control: multipath-udeb: add sg3-udeb Depends
+    - patches to multipath source:
+      - 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)
+    - 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
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+    - d/control, d/rules: i386 related fixes
+      - 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.
+    - 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/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - d/rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - 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
+      - Use stable wwn-* names in autopkgtest that work with or without
+        friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+  * Dropped changes, superseeded by systemd switch to service script:
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make
+      sure that multipathd will be able to start.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Aug 2020 00:12:32 +0200
+
 multipath-tools (0.8.4-4) unstable; urgency=medium
 
   * [637efc8] Remove overly complicated INSTALL_PROGRAM setup.
@@ -180,6 +644,87 @@ multipath-tools (0.8.4-4) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Sun, 30 Aug 2020 01:14:10 +0000
 
+multipath-tools (0.8.4-3ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - 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
+    - d/control: multipath-udeb: add sg3-udeb Depends
+    - patches to multipath source:
+      - 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)
+    - 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
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+    - d/control, d/rules: i386 related fixes
+      - 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.
+    - 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/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - 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.
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - 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
+      - Use stable wwn-* names in autopkgtest that work with or without
+        friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 17 Aug 2020 11:26:27 +0200
+
 multipath-tools (0.8.4-3) unstable; urgency=medium
 
   * [c8c0700] Fix build with newer json-c.
@@ -187,12 +732,176 @@ multipath-tools (0.8.4-3) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Fri, 31 Jul 2020 09:31:38 +0000
 
+multipath-tools (0.8.4-2ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - 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
+    - d/control: multipath-udeb: add sg3-udeb Depends
+    - patches to multipath source:
+      - 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)
+    - 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
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+    - d/control, d/rules: i386 related fixes
+      - 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.
+    - 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/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - 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.
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - 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
+      - Use stable wwn-* names in autopkgtest that work with or without
+        friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+    - debian/patches/newer-jsonc.patch
+      - patch for newer json-c
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 31 Jul 2020 10:20:36 +0200
+
 multipath-tools (0.8.4-2) unstable; urgency=medium
 
   * [b270b02] Fix FTBFS with gcc-10 (Closes: #957568)
 
  -- Chris Hofstaedtler <zeha@debian.org>  Wed, 22 Jul 2020 22:23:13 +0000
 
+multipath-tools (0.8.4-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1886693). Remaining changes:
+    - 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
+    - d/control: multipath-udeb: add sg3-udeb Depends
+    - patches to multipath source:
+      - 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)
+    - 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
+    - debian/multipath-tools.dm-mpath-lvm.udev: Adjust initramfs integration
+      for new udev rules
+    - 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
+    - d/control: Enable udebs on riscv64 to fix FTBFS.
+    - d/control, d/rules: i386 related fixes
+      - 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.
+    - 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/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
+      deleted message to stdout again, not stderr; to fix autopkgtest
+    - d/multipath.conf: Install friendly names multipath.conf by default,
+      instead of generating it in every installer.
+    - 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.
+    - d/p/no-start-in-containers.patch: Do not attempt to start
+      multipath-tools in containers, should switch for on-demand udev/socket
+      based activation in the future. (LP 1823093)
+    - d/p/kpartx-Improve-finding-loopback-device-by-file.patch: Improve
+      finding loopback devices (LP 1747044)
+    - 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
+      - Use stable wwn-* names in autopkgtest that work with or without
+        friendly names, as scsi-${DM_NAME} is not a stable symlink name.
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Wed, 08 Jul 2020 03:59:53 +0000
+
 multipath-tools (0.8.4-1) unstable; urgency=medium
 
   * [f4b2af2] kpartx: use correct path to partx in udev rule (Closes: #959727)
@@ -201,6 +910,95 @@ multipath-tools (0.8.4-1) unstable; urgency=medium
 
  -- Chris Hofstaedtler <zeha@debian.org>  Sun, 21 Jun 2020 16:23:30 +0000
 
+multipath-tools (0.8.3-1ubuntu2) focal; urgency=medium
+
+  * Enable udebs on riscv64 to fix FTBFS.
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 06 Apr 2020 18:17:20 +1000
+
+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.
+   - 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
+    - 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]
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 11:57:46 -0800
+
 multipath-tools (0.8.3-1) unstable; urgency=medium
 
   * [6b91b76] New upstream version 0.8.3
@@ -208,6 +1006,144 @@ multipath-tools (0.8.3-1) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <steve.langasek@ubuntu.com>  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 <adconrad@ubuntu.com>  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 <adconrad@ubuntu.com>  Wed, 09 Oct 2019 14:09:21 -0600
+
+multipath-tools (0.7.9-3ubuntu4) eoan; urgency=medium
+
+  * Rebuild against new libjson-c4.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  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 <xnox@ubuntu.com>  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 <xnox@ubuntu.com>  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 <christian.ehrhardt@canonical.com>  Mon, 29 Apr 2019 16:14:26 +0200
+
 multipath-tools (0.7.9-3) unstable; urgency=medium
 
   * [51a7724] Reliably extract the running systemd version
@@ -301,6 +1237,126 @@ multipath-tools (0.7.4-3) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <xnox@ubuntu.com>  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 <xnox@ubuntu.com>  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 <xnox@ubuntu.com>  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 <doko@ubuntu.com>  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 <juliank@ubuntu.com>  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 <juliank@ubuntu.com>  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 <juliank@ubuntu.com>  Wed, 24 Jan 2018 10:57:46 +0100
+
 multipath-tools (0.7.4-2) unstable; urgency=medium
 
   * Upload to Unstable
@@ -332,6 +1388,89 @@ multipath-tools (0.7.4-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <christian.ehrhardt@canonical.com>  Tue, 18 Jul 2017 14:12:53 +0200
+
 multipath-tools (0.6.4-5) unstable; urgency=medium
 
   * Ship multipath udev rules (Closes: #858456)
@@ -355,6 +1494,163 @@ multipath-tools (0.6.4-4) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  Mon, 20 Feb 2017 19:36:31 +0530
 
+multipath-tools (0.6.4-3ubuntu6) artful; urgency=medium
+
+  * Rebuild against new liburcu6.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  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 <jbicha@ubuntu.com>  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 <mauricfo@linux.vnet.ibm.com>  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 <cyphermox@ubuntu.com>  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 <cyphermox@ubuntu.com>  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 <christian.ehrhardt@canonical.com>  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.
@@ -487,6 +1783,164 @@ multipath-tools (0.5.0+git1.656f8865-6) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <doko@ubuntu.com>  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 <ubuntu@desserud.org>  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 <louis.bouchard@ubuntu.com>  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 <louis.bouchard@ubuntu.com>  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 <xnox@ubuntu.com>  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 <cyphermox@ubuntu.com>  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 <ryan.harper@canonical.com>  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
@@ -577,6 +2031,190 @@ multipath-tools (0.5.0+git0.770e6d0d-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <xnox@ubuntu.com>  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 <xnox@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <steve.langasek@ubuntu.com>  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 <mauricfo@linux.vnet.ibm.com>  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 <mathieu-tl@ubuntu.com>  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 <mauricfo@linux.vnet.ibm.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  Mon, 06 Jul 2015 13:15:22 -0400
+
 multipath-tools (0.5.0-7) unstable; urgency=medium
 
   * [15ecad9] Add dm-service-time path checker.
@@ -728,6 +2366,100 @@ multipath-tools (0.4.9+git0.4dfdaf2b-1) experimental; urgency=low
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <mathieu-tl@ubuntu.com>  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 <mathieu-tl@ubuntu.com>  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 <adconrad@ubuntu.com>  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 <rafael.tinoco@canonical.com>  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 <seyeong.kim@canonical.com>  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 <psusi@ubuntu.com>  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 <cjwatson@ubuntu.com>  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 <psusi@ubuntu.com>  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 <cjwatson@ubuntu.com>  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 <cjwatson@ubuntu.com>  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 <psusi@ubuntu.com>  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 <doko@ubuntu.com>  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.
@@ -741,6 +2473,36 @@ multipath-tools (0.4.9-3) unstable; urgency=low
 
  -- Ritesh Raj Sarraf <rrs@debian.org>  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 <serge.hallyn@ubuntu.com>  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
@@ -915,6 +2677,108 @@ multipath-tools (0.4.8-15) unstable; urgency=low
 
  -- Guido Günther <agx@sigxcpu.org>  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 <craig.magina@canonical.com>  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 <serge.hallyn@ubuntu.com>  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 <dann.frazier@canonical.com>  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 <serge.hallyn@ubuntu.com>  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 <serge.hallyn@ubuntu.com>  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 <serge.hallyn@ubuntu.com>  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 <serge.hallyn@ubuntu.com>  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 <martin.pitt@ubuntu.com>  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 <cjwatson@ubuntu.com>  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 <tjaalton@ubuntu.com>  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 <tjaalton@ubuntu.com>  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
@@ -977,6 +2841,64 @@ multipath-tools (0.4.8-11) unstable; urgency=low
 
  -- Guido Guenther <agx@sigxcpu.org>  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 <tjaalton@ubuntu.com>  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 <scott@ubuntu.com>  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 <scott@ubuntu.com>  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 <tjaalton@ubuntu.com>  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 <tepsipakki@ubuntu.com>  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 <soren@ubuntu.com>  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
@@ -1010,6 +2932,32 @@ multipath-tools (0.4.8-8) unstable; urgency=low
 
  -- Guido Guenther <agx@sigxcpu.org>  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 <soren@ubuntu.com>  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 <soren@ubuntu.com>  Mon, 28 Jan 2008 11:09:45 +0100
+
 multipath-tools (0.4.8-7) unstable; urgency=low
 
   * add watch file
@@ -1031,6 +2979,26 @@ multipath-tools (0.4.8-6) unstable; urgency=low
 
  -- Guido Guenther <agx@sigxcpu.org>  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 <soren@ubuntu.com>  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
@@ -1145,6 +3113,34 @@ multipath-tools (0.4.7-3) experimental; urgency=low
 
  -- Guido Guenther <agx@sigxcpu.org>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  Wed, 16 May 2007 11:02:20 +0200
+
 multipath-tools (0.4.7-2) unstable; urgency=low
 
   [ Bastian Blank ]
@@ -1162,6 +3158,42 @@ multipath-tools (0.4.7-2) unstable; urgency=low
 
  -- Guido Guenther <agx@sigxcpu.org>  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 <fabbione@ubuntu.com>  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 <iwj@ubuntu.com>  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 <scott@ubuntu.com>  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.
@@ -1174,6 +3206,77 @@ multipath-tools (0.4.7-1.1) unstable; urgency=medium
 
  -- John Goerzen <jgoerzen@complete.org>  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 <scott@ubuntu.com>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  Thu, 06 Apr 2006 09:33:51 +0200
+
+multipath-tools (0.4.7-1ubuntu2) dapper; urgency=low
+
+  * Fix socket permissions.
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  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 <fabbione@ubuntu.com>  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 7da7ad3..44adb8c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: multipath-tools
 Section: admin
 Priority: optional
-Maintainer: Debian DM Multipath Team <team+linux-blocks@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian DM Multipath Team <team+linux-blocks@tracker.debian.org>
 Uploaders: Guido Günther <agx@sigxcpu.org>,
            Ritesh Raj Sarraf <rrs@debian.org>,
            Chris Hofstaedtler <zeha@debian.org>
@@ -52,12 +53,20 @@ Description: create device mappings for partitions
  It is part of the Linux multipath-tools, but is useful on any
  device-mapper using system.
 
+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: initramfs-tools | linux-initramfs-tool,
          lsb-base,
          multipath-tools (<< ${source:Version}.1~),
          multipath-tools (>= ${source:Version}),
+         kpartx-boot (= ${binary:Version}),
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Support booting from multipath devices
diff --git a/debian/initramfs/hooks/multipath b/debian/initramfs/hooks/multipath
index 9c6429d..af49c98 100755
--- a/debian/initramfs/hooks/multipath
+++ b/debian/initramfs/hooks/multipath
@@ -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
@@ -47,12 +55,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/scripts/init-top/multipath b/debian/initramfs/scripts/init-top/multipath
index 51637e9..883d7f9 100755
--- a/debian/initramfs/scripts/init-top/multipath
+++ b/debian/initramfs/scripts/init-top/multipath
@@ -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/scripts/local-top/multipath b/debian/initramfs/scripts/local-bottom/multipath
similarity index 56%
rename from debian/initramfs/scripts/local-top/multipath
rename to debian/initramfs/scripts/local-bottom/multipath
old mode 100755
new mode 100644
index 560ac2d..13026ff
--- a/debian/initramfs/scripts/local-top/multipath
+++ b/debian/initramfs/scripts/local-bottom/multipath
@@ -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/scripts/local-premount/multipath b/debian/initramfs/scripts/local-premount/multipath
new file mode 100644
index 0000000..050f97b
--- /dev/null
+++ b/debian/initramfs/scripts/local-premount/multipath
@@ -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.install b/debian/kpartx-boot.install
new file mode 100644
index 0000000..7a9c43e
--- /dev/null
+++ b/debian/kpartx-boot.install
@@ -0,0 +1 @@
+debian/kpartx-initramfs/hooks usr/share/initramfs-tools/
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-initramfs/hooks/kpartx b/debian/kpartx-initramfs/hooks/kpartx
new file mode 100755
index 0000000..404f977
--- /dev/null
+++ b/debian/kpartx-initramfs/hooks/kpartx
@@ -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/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 74b2b84..fb5e89e 100644
--- a/debian/multipath-tools.install
+++ b/debian/multipath-tools.install
@@ -11,3 +11,4 @@
 /usr/lib/tmpfiles.d/multipath.conf
 /usr/share/man/man*/mpath*
 /usr/share/man/man*/multi*
+/etc/multipath.conf
diff --git a/debian/multipath-udeb.install b/debian/multipath-udeb.install
index 40452f0..efb238d 100644
--- a/debian/multipath-udeb.install
+++ b/debian/multipath-udeb.install
@@ -7,3 +7,4 @@ debian/tmp-multipath-udeb/lib/multipath/ lib/
 debian/tmp-multipath-udeb/sbin/multipath sbin/
 lib/udev/rules.d/11-dm-mpath.rules
 lib/udev/rules.d/56-multipath.rules
+/etc/multipath.conf
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/enable-find-multipaths.patch b/debian/patches/enable-find-multipaths.patch
new file mode 100644
index 0000000..6246a5d
--- /dev/null
+++ b/debian/patches/enable-find-multipaths.patch
@@ -0,0 +1,17 @@
+From: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
+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
+@@ -24,7 +24,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/series b/debian/patches/series
index d433b7d..1a0661f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+enable-find-multipaths.patch
 0002-Update-build-flags.patch
 0007-11-dm-mpath-fix-DM_UDEV_RULES_VSN-check.patch
 0008-Bug-916521-FTCBFS-uses-the-wrong-pkg-config.patch
diff --git a/debian/rules b/debian/rules
index f081f62..b2f9922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),i386)
+	skip_packages = -Nmultipath-tools
+endif
+
 # For Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/pkg-info.mk
@@ -47,6 +52,9 @@ override_dh_auto_install:
 	dh_auto_install --sourcedirectory=debian/build-deb -- DESTDIR=$(CURDIR)/debian/tmp
 	dh_auto_install --sourcedirectory=debian/build-udeb -- DESTDIR=$(CURDIR)/debian/tmp-multipath-udeb
 
+	mkdir -p $(CURDIR)/debian/tmp/etc
+	cp debian/multipath.conf $(CURDIR)/debian/tmp/etc
+
 	cp kpartx/del-part-nodes.rules debian/kpartx.del-part-nodes.udev
 	cp kpartx/dm-parts.rules debian/kpartx.dm-parts.udev
 	cp kpartx/kpartx.rules debian/kpartx.udev
@@ -71,12 +79,10 @@ override_dh_bugfiles:
 	dh_bugfiles -A -pmultipath-tools -pmultipath-tools-boot
 
 override_dh_installinit:
-	dh_installinit -pmultipath-tools-boot --name=multipath-tools-boot --no-start -- start 21 S .
-	dh_installinit -pmultipath-tools-boot
-	dh_installinit -pmultipath-tools
+	# Don't run dh_installinit
 
 override_dh_installudev:
-	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
@@ -89,3 +95,10 @@ override_dh_installsystemd:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a --add-udeb=multipath-udeb
+
+override_dh_builddeb:
+	dh_builddeb ${skip_packages}
+
+override_dh_gencontrol:
+	dh_gencontrol ${skip_packages}
+
