Merge ~paelzer/ubuntu/+source/multipath-tools:merge-artful into ~usd-import-team/ubuntu/+source/multipath-tools:debian/sid

[ChristianEhrhardt]

Merge for Artful

[ChristianEhrhardt (paelzer)]

I set Mathieu as reviewer as he is the real owner of multipath and Locutus as he asked for the merge today.

[Nish Aravamudan (nacc)]

W: Expected old/debian (f620d8a88361e00ecced52874626792ade5191ea) is not the same commit as paelzer/old/debian (01363d97b0860f4eeb74f63e755e6bc9147accb0)
E: Expected old/debian (41104278899b70fefe0ca3c24785a1ffaea90ce9) is not the same tree as paelzer/old/debian (7f557514e0639462aaa5ff4523df244980e98b0c)
W: Expected old/ubuntu (571ebab5cf002073433260c8c223a713551d66db) is not the same commit as paelzer/old/ubuntu (aca777a8dfc2de383fefc1cae6775a00f41b5829)
E: Expected old/ubuntu (f4cd2bbb055d15aff843351ccaa2e1dfc0bc7274) is not the same tree as paelzer/old/ubuntu (9ce6a678d2ec40bb833c43b423ba6c2e991589b0)
W: Expected new/debian (188a3d6b61d94c19153dd32ab16bafaeee958de6) is not the same commit as paelzer/new/debian (ea22feb298f1aa175e7d30e28773eab9b0cef3ef)
E: Expected new/debian (83c617aa74241f61f1e62b976aa5898ae48d90a8) is not the same tree as paelzer/new/debian (3edab67c7586419705e3b69a2430b753753fdf2d)
E: More than one changelog diff hunk detected
+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...

review: Needs Fixing

[ChristianEhrhardt (paelzer)]

I only have a small testbed in regard to multipath, but did what I could to verify:
- s390x multipath setup (2 disks, 2 paths each, 1:1 mappings of adapter to wwn)
  - upgrade to new package - ok
  - reboot with new packaage - ok
- autopkgtests ran against the bileto ppa - ok
  - this need sto run vs proposed as liburcu6 is currently in proposed migration
- FYI Build in Bileto: https://bileto.ubuntu.com/#/ticket/2870

[LocutusOfBorg (costamagnagianfranco)]

I think this is good, but lets wait a little bit for other opinions and for liburcu migration

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me, except maybe that now I wonder why we use partx in the udev rules rather than kpartx (I see no benefit to --nr... ); please don't think that I "own" multipath-tools though. You should feel free to upload and do the requisite testing, as much as you can, to validate that multipath-tools works correctly.

review: Approve

[ChristianEhrhardt (paelzer)]

Thanks for all your reviews.
I'm likely going to upload then, but I want to look into the reports by the automated linter, posting findings one by one and eventually conclude with fixes and/or please merge now.

E: More than one changelog diff hunk detected

That is odd, the report shows:
2017 14:12:53 +0200
 multipath-tools (0.6.4-5) unstable; urgency=medium

   * Ship multipath udev rules (Closes: #858456)

  -- Patrick Caulfield <email address hidden> Wed, 3 Nov 2004 10:16:34 +0000

+

But the context there is way too old.
Maybe it got it wrong due to the old old/debian, new/debian, ... - more on that in the next post.

The following looks sane:
$ git diff new/debian -- debian/changelog

[ChristianEhrhardt (paelzer)]

W: Expected old/debian (f620d8a88361e00ecced52874626792ade5191ea) is not the same commit as paelzer/old/debian (01363d97b0860f4eeb74f63e755e6bc9147accb0)
E: Expected old/debian (41104278899b70fefe0ca3c24785a1ffaea90ce9) is not the same tree as paelzer/old/debian (7f557514e0639462aaa5ff4523df244980e98b0c)
W: Expected old/ubuntu (571ebab5cf002073433260c8c223a713551d66db) is not the same commit as paelzer/old/ubuntu (aca777a8dfc2de383fefc1cae6775a00f41b5829)
E: Expected old/ubuntu (f4cd2bbb055d15aff843351ccaa2e1dfc0bc7274) is not the same tree as paelzer/old/ubuntu (9ce6a678d2ec40bb833c43b423ba6c2e991589b0)
W: Expected new/debian (188a3d6b61d94c19153dd32ab16bafaeee958de6) is not the same commit as paelzer/new/debian (ea22feb298f1aa175e7d30e28773eab9b0cef3ef)
E: Expected new/debian (83c617aa74241f61f1e62b976aa5898ae48d90a8) is not the same tree as paelzer/new/debian (3edab67c7586419705e3b69a2430b753753fdf2d)

Yeah I didn't repush old/new branches to to my repo.
Not important for the actual merge as the merge base is correct.
But the linter found the old ones of the zesty merge still around.

I pushed the updated tags in my repo to match the current USDI state to fix it.

[ChristianEhrhardt (paelzer)]

There are two partx (instead of kpartx) references:
1. in debian/initramfs/hooks
  copy_exec /usr/bin/partx
2. debian/multipath-tools.dm-mpath-lvm.udev
  RUN+="/usr/bin/partx -d --nr 1-1024 $devnode",

These reference are there "that way" since

+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 <email address hidden> Thu, 11 Feb 2016 19:08:14 -0500

These files are part of multipath-tools which depends on kpartx.
So yeah one could change that, but that is not (doesn't have to be) part of the merge IMHO.

[ChristianEhrhardt (paelzer)]

I think we are ready to upload th emerge tag and I would upload the package.

But there is a new rebuild in artful-p that we need to integrate
https://launchpad.net/ubuntu/+source/multipath-tools/0.6.4-3ubuntu6

I could just smash it into the changelog as it is CL only, but I might affect the merges to keep the rich history.
I'd more like:
1. an re-import of multipath
2. making sure changelogs are correct
3. I need to fixup and modify logical/reconstruct/deconstruct
4. push all those tags

Hmm much effort for a pure changelog entry that we are going to overwrite in artful-proposed in a minute.
Can we ignore that if it was never release?

cd2f5a9... by ChristianEhrhardt on 2017-07-19

changelog: insert non-imported no change rebuilds

There are two no-change rebuilds in artful-proposed which were missing
on ubuntu/devel so far.
After a discussion on [1] we agreed that adding a new commit at the tail
of the merge is fine to keep rich history.

[1]: https://irclogs.ubuntu.com/2017/07/19/%23ubuntu-server.html

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

[ChristianEhrhardt (paelzer)]

    changelog: insert non-imported no change rebuilds

    There are two no-change rebuilds in artful-proposed which were missing
    on ubuntu/devel so far.
    After a discussion on [1] we agreed that adding a new commit at the tail
    of the merge is fine to keep rich history.

[1]: https://irclogs.ubuntu.com/2017/07/19/%23ubuntu-server.html adding:

[ChristianEhrhardt (paelzer)]

Addressed all review feedback and ready to merge before upload.

[Nish Aravamudan (nacc)]

On Wed, Jul 19, 2017 at 10:10 AM, ChristianEhrhardt
<email address hidden> wrote:
> W: Expected old/debian (f620d8a88361e00ecced52874626792ade5191ea) is not the same commit as paelzer/old/debian (01363d97b0860f4eeb74f63e755e6bc9147accb0)
> E: Expected old/debian (41104278899b70fefe0ca3c24785a1ffaea90ce9) is not the same tree as paelzer/old/debian (7f557514e0639462aaa5ff4523df244980e98b0c)
> W: Expected old/ubuntu (571ebab5cf002073433260c8c223a713551d66db) is not the same commit as paelzer/old/ubuntu (aca777a8dfc2de383fefc1cae6775a00f41b5829)
> E: Expected old/ubuntu (f4cd2bbb055d15aff843351ccaa2e1dfc0bc7274) is not the same tree as paelzer/old/ubuntu (9ce6a678d2ec40bb833c43b423ba6c2e991589b0)
> W: Expected new/debian (188a3d6b61d94c19153dd32ab16bafaeee958de6) is not the same commit as paelzer/new/debian (ea22feb298f1aa175e7d30e28773eab9b0cef3ef)
> E: Expected new/debian (83c617aa74241f61f1e62b976aa5898ae48d90a8) is not the same tree as paelzer/new/debian (3edab67c7586419705e3b69a2430b753753fdf2d)
>
> Yeah I didn't repush old/new branches to to my repo.
> Not important for the actual merge as the merge base is correct.
> But the linter found the old ones of the zesty merge still around.

Right, the linter does not treat the above as fatal (F: ). But it does
indicate they are problems for the linter itself (it can't lint
further really without the above passing).

[Nish Aravamudan (nacc)]

On Wed, Jul 19, 2017 at 10:05 AM, ChristianEhrhardt
<email address hidden> wrote:
> Thanks for all your reviews.
> I'm likely going to upload then, but I want to look into the reports by the automated linter, posting findings one by one and eventually conclude with fixes and/or please merge now.
>
>
> E: More than one changelog diff hunk detected
>
> That is odd, the report shows:
> 2017 14:12:53 +0200
> multipath-tools (0.6.4-5) unstable; urgency=medium
>
> * Ship multipath udev rules (Closes: #858456)
>
> -- Patrick Caulfield <email address hidden> Wed, 3 Nov 2004 10:16:34 +0000
>
> +
>
>
> But the context there is way too old.
> Maybe it got it wrong due to the old old/debian, new/debian, ... - more on that in the next post.

I think this might be a bug in git-merge-changelogs. I'm debugging it
now. Basically, the linter takes new/debian and runs
`git-merge-changelogs` with the expected parameters from our process
and compares that treeish to the proposed target to ensure only new
changelogs entries are introduced. For some reason, that treeish is
removing the last line in d/changelog relative to new/debian.

diff --git a/debian/changelog b/debian/changelog
index 8f545ee..56e65c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,86 @@
+multipath-tools (0.6.4-5ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. (LP: #1548303) Remaining changes:
+    - d/control:
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP 941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP 1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP 1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP 1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy dm-mpath-lvm & multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP 1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP 1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Disable -fexceptions on multipath-udeb (LP 1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     on the new multipath-tools with udev property blacklisting (LP 1540401)
+     - d/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+     - d/initramfs/init-top: load the dm-multipath module for
+       'multipath -c'.
+     - d/initramfs/init-top: start multipathd before udev (required by
+       'multipath -u' in the udev rules)
+     - d/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+     - d/rules: rename multipath-tools udev to dm-mpath-lvm
+     - d/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+       'multipath -u' which can read udev properties at PROGRAM-rule time
+       (when udev properties are not yet written to the udev database).
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP 1231182)
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+    - debian/initramfs/local-bottom: wait for the multipathd unix socket
+      to close, so to avoid multipathd.socket unit failure. (LP 1682178)
+    - debian/initramfs/hooks: Add dm-queue-length: users may want to change
+      from the default selector and should be able to do so. (LP 1673350)
+  * Drop changes (in Debian now):
+    - d/control: Bump udev dependencies (in Debian)
+    - debian/initramfs/hooks:
+      - Remove old dm-emc module; it hasn't been in kernel since 2.6.27.
+    - d/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+      where uploads might break kpartx's loopback file handling.
+    - mark kpartx tests as isolation-machine to avoid issues in e.g. LXD
+      autopkgtest environments (LP 1644253)
+    - d/t/tgtbasedmpaths add Test using tgt and open-iscsi to excercise
+      multipath
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 18 Jul 2017 14:12:53 +0200
+
 multipath-tools (0.6.4-5) unstable; urgency=medium
 
   * Ship multipath udev rules (Closes: #858456)
@@ -21,6 +104,163 @@ multipath-tools (0.6.4-4) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Mon, 20 Feb 2017 19:36:31 +0530
 
+multipath-tools (0.6.4-3ubuntu6) artful; urgency=medium
+
+  * Rebuild against new liburcu6.
+
+ -- Gianfranco Costamagna <[e-mail]>  Tue, 18 Jul 2017 12:08:33 +0200
+
+multipath-tools (0.6.4-3ubuntu5) artful; urgency=medium
+
+  * No-change rebuild against latest liburcu
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 15 Jul 2017 09:44:44 -0400
+
+multipath-tools (0.6.4-3ubuntu4) zesty; urgency=medium
+
+  * debian/initramfs/local-bottom: wait for the multipathd unix socket
+    to close, so to avoid multipathd.socket unit failure. (LP: #1682178)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Wed, 12 Apr 2017 14:30:13 -0400
+
+multipath-tools (0.6.4-3ubuntu3) zesty; urgency=medium
+
+  * debian/initramfs/hooks, debian/initramfs/local-bottom:
+    Update hooks and local-bottom to use /run instead of /var/run as a path
+    for multipathd.pid in the initramfs. (LP: #1670811)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 28 Mar 2017 21:20:22 -0400
+
+multipath-tools (0.6.4-3ubuntu2) zesty; urgency=medium
+
+  * debian/initramfs/hooks:
+    - Remove old dm-emc module; it hasn't been in kernel since 2.6.27.
+    - Add dm-queue-length: users may want to change from the default selector
+      and should be able to do so. (LP: #1673350)
+  * debian/patches/path_selector.patch, debian/patches/series: remove
+    path_selector.patch to get back to the "right" default selector of
+    service-time, which has been included in the kernel module packages for
+    a while now and has better throughput than round-robin. It's also the
+    default upstream. (LP: #1634161)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 17 Mar 2017 09:37:36 -0400
+
+multipath-tools (0.6.4-3ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian. (LP: #1621340, LP: #1645274) Remaining changes:
+    - d/control:
+      - Bump udev dependencies
+      - multipath-udeb: add sg3-udeb Depends
+    - d/rules: Move udev rules to priority 95, because rules that load modules
+      should be >90.
+    - d/multipath-tools.preinst: modprobe dm-multipath; This will make sure
+      that multipathd will be able to start.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+      - d/initramfs/kpartx.hook
+      - d/kpartx-boot.postinst
+      - d/kpartx-boot.postrm
+      - d/control: Add kpartx-boot package for dmraid
+      - d/rules: Install kpartx initramfs hook
+      - d/kpartx.install: install all arch /lib* kpartx udev rules
+    - patches (some refreshed to new version) to multipath source
+      - d/p/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+      - d/p/path_selector.patch: switch the default path selector
+        back to round-robin while service-time isn't available to the installer
+        multipath-modules.
+      - d/p/kpartx_more_loopback_fixes.patch: fix loopback mounted
+        files some more: since we stat() the loopback device node, we can't rely
+        on S_ISREG() tests to handle this case, and should look at the device
+        itself instead. (LP: #1543430)
+      - d/p/enable-find-multipaths.patch: re-enable find_multipaths
+        by default -- see the removed 'add_find-multipaths.patch' (LP: #1463046)
+   - multipath initramfs fixes for booting from multipathed devices
+      - d/initramfs/hooks: also copy wwids file on the installed system to
+        ensure all paths come up on boot. (LP: #1479929)
+      - d/initramfs/hooks: install multipathd and required directories.
+      - d/initramfs/hooks: copy dm-mpath-lvm & multipath udev rules to initramfs
+      - d/initramfs/hooks: do not copy kpartx rules to initramfs
+      - d/initramfs/local-bottom: remember to stop multipathd.
+      - d/initramfs/local-premount: wait for udev to settle before the call to
+        resolve_device() in local_mount_root(), so the by-uuid/ symlinks have a
+        chance to be updated by the multipath udev rules (LP: #1503286).
+      - d/initramfs/local-premount: Run multipath with -B so not to assign names
+        nor change /etc/multipath/bindings during initramfs (LP: #1561103)
+      - d/rules: install d/initramfs/local-bottom
+      - d/rules: install d/initramfs/local-premount
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     (LP: #1540401)
+   - Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+     libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+     which is not available in the installer environment.
+     - d/p/disable-fexceptions-udeb.patch: conditionally disable -fexceptions
+       with CFLAGS_DISABLE_FEXCEPTIONS.
+     - d/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+   - d/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+     where uploads might break kpartx's loopback file handling.
+   - Remove partition device nodes of individual paths (for LVM on multipath)
+     on the new multipath-tools with udev property blacklisting (LP: #1540401)
+     - d/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+     - d/initramfs/init-top: load the dm-multipath module for
+       'multipath -c'.
+     - d/initramfs/init-top: start multipathd before udev (required by
+       'multipath -u' in the udev rules)
+     - d/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+     - d/rules: rename multipath-tools udev to dm-mpath-lvm
+     - d/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+       'multipath -u' which can read udev properties at PROGRAM-rule time
+       (when udev properties are not yet written to the udev database).
+   - Remove d/initramfs/local-top (redundant with other initramfs scripts):
+     - init-top: take over loading modules (dm-multipath and SCSI device
+       handlers); move the missing dm-emc there (now scsi-dh-emc;
+       see BTS 567014).
+     - d/rules: do not install local-top anymore.
+     - remove d/initramfs/local-top
+    - Fixes typo in package description (availibility -> availability)
+      (LP: #1231182)
+  * Add changes:
+    - mark kpartx tests as isolation-machine to avoid issues in e.g. LXD
+      autopkgtest environments (LP: #1644253)
+    - d/t/tgtbasedmpaths add Test using tgt and open-iscsi to excercise
+      multipath
+    - d/control mark transition of file /etc/init.d/multipath-tools-boot
+      according to case #9 of https://wiki.debian.org/PackageTransition
+  * Drop changes:
+    - d/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls.
+      (file no more used)
+    - d/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+      (file no more used)
+    - d/initramfs/local-top: run multipathd rather than a one-off call to
+      multipath so that new paths can be correctly added as detected while we're
+      still in the initramfs.
+      (file no more used)
+    - Call clean target before rebuilding with systemd support (in Debian)
+    - drop build-dep to dpkg-dev (>= 1.16.1~), libudev-dev"
+      (No more needed)
+    - Bump Standards-Version to 3.9.6 (in Debian)
+    - add / to LIB= of DEB_CFLAGS_MAINT_APPEND (in Debian)
+    - d/p/handle_spaces_in_rev_attr.patch: support IBM IPR devices and others
+      which may have only spaces for the rev attribute. (upstream)
+    - d/p/0015-shared-lock-for-udev.patch: (LP: #1431650) (upstream)
+    - d/p/0053-readonly-bindings_multipathd_prod.patch: support
+      -B to allow multipathd to handle cases where the bindings file is
+      read-only. (upstream)
+    - d/p/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal with
+      spaces in device names in kpartx too (LP: #1432062) (upstream)
+    - d/p/0001-multipath-tools-fix-dm-device-filtering.patch: Allow
+      filtering of DEV_UEVENT dev_type (LP: #1570093) (upstream)
+    - d/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+      from the old device names with device numbers to using letters for devices.
+      (no relevant upgrade path left)
+    - d/p/mpath_name_migration.patch: ship a multipath_migrate binary
+      to make translation from pre-0.5.0 device naming to the new scheme.
+      (no relevant upgrade path left)
+    - d/initramfs/hooks: use 95 not 60 for multipath rules priority (file not
+      shipped anymore, so no need to touch)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 27 Jan 2017 09:09:37 +0100
+
 multipath-tools (0.6.4-3) unstable; urgency=medium
 
   * [3eecdba] Include libmpathcmd.so in the udeb package.
@@ -153,6 +393,164 @@ multipath-tools (0.5.0+git1.656f8865-6) unstable; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 12 Mar 2016 17:47:25 +0530
 
+multipath-tools (0.5.0+git1.656f8865-5ubuntu7) yakkety; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <[e-mail]>  Sat, 17 Sep 2016 12:06:37 +0000
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu6) yakkety; urgency=medium
+
+  * Fixes typo in package description (availibility -> availability)
+    (LP: #1231182)
+
+ -- Hans Joachim Desserud <[e-mail]>  Sun, 04 Sep 2016 13:19:49 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu5) yakkety; urgency=medium
+
+  [ Dragan Stancevic ]
+  * d/p/0001-multipath-tools-fix-dm-device-filtering.patch :
+    multipath-tools: fix dm- device filtering
+   - Allow filtering of DEV_UEVENT dev_type
+   - Resolves LP: #1570093
+   - Proper patch included in the source package this time. Previous upload
+     only had the changelog entry.
+
+ -- Louis Bouchard <[e-mail]>  Tue, 19 Jul 2016 14:17:14 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu4) yakkety; urgency=medium
+
+  [ Dragan Stancevic ]
+  * multipath-tools: fix dm- device filtering
+   - Allow filtering of DEV_UEVENT dev_type
+   - Resolves LP: #1570093
+
+ -- Louis Bouchard <[e-mail]>  Mon, 18 Jul 2016 12:37:04 +0200
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu3) yakkety; urgency=medium
+
+  * Cherrypick from debian:
+   - Call clean target before rebuilding with systemd support
+   - Call systemd in debian/rules. Also adapt init service
+     aliasing.
+   - Should resolve LP: #1578638, LP: #1589526, LP: #1583563.
+ 
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 16 Jun 2016 11:53:33 +0300
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu2) xenial; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Remove partition device nodes of individual paths (for LVM on multipath)
+    on the new multipath-tools with udev property blacklisting (LP: #1540401)
+    - debian/multipath-tools.dm-mpath-lvm.udev: replace 'multipath -c' with
+      'multipath -u' which can read udev properties at PROGRAM-rule time
+      (when udev properties are not yet written to the udev database).
+    - debian/initramfs/init-top: start multipathd before udev (required by
+      'multipath -u' in the udev rules)
+    - debian/initramfs/local-top: remove snippet to start multipathd.
+  * Remove debian/initramfs/local-top (redundant with other initramfs scripts):
+    - init-top: start multipathd.
+    - init-top: load modules (dm-multipath and SCSI device handlers); move the
+      missing dm-emc there (now scsi-dh-emc; see BTS 567014).
+    - local-premount: settle on udev events; and the extra call due to
+      multipath discovery in udev rules is no longer required with multipathd
+      in initramfs.
+    - debian/rules: do not install local-top anymore.
+  * debian/initramfs/local-premount: run multipath with -B so not to assign
+    names nor change /etc/multipath/bindings during initramfs (LP: #1561103)
+  * debian/patches/enable-find-multipaths.patch: re-enable find_multipaths
+    by default -- see the removed 'add_find-multipaths.patch' (LP: #1463046) 
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 04 Apr 2016 22:36:48 -0400
+
+multipath-tools (0.5.0+git1.656f8865-5ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian. (LP: #1551952) (LP: #1540407)
+    Remaining changes:
+    - debian/control:
+      - Bump debhelper dependency to install udev rules to
+        /lib/udev/rules.d
+      - Bump udev dependencies as well
+    - debian/control:
+      - multipath-tools: add sg3-utils-dev Depends
+      - multipath-udeb: add sg3-udeb Depends
+    - debian/initramfs/hooks: use 95 not 60 for multipath rules priority
+    - debian/rules: Move udev rules to priority 95, because rules that load modules should be >90.
+    - debian/multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - debian/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls.
+    - debian/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+      - debian/initramfs/kpartx.hook
+      - debian/kpartx-boot.postinst
+      - debian/kpartx-boot.postrm
+      - debian/kpartx.install
+      - debian/control: Add kpartx-boot package for dmraid
+      - debian/rules: Install kpartx initramfs hook
+    - debian/patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - debian/patches/handle_spaces_in_rev_attr.patch: support IBM IPR devices
+      and others which may have only spaces for the rev attribute.
+    - debian/patches/path_selector.patch: switch the default path selector
+      back to round-robin while service-time isn't available to the installer
+      multipath-modules.
+    - debian/patches/0015-shared-lock-for-udev.patch: (LP: #1431650)
+    - debian/initramfs/hooks: also copy wwids file on the installed system to
+      ensure all paths come up on boot. (LP: #1479929)
+    - Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+      libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+      which is not available in the installer environment.
+      - debian/patches/disable-fexceptions-udeb.patch: conditionally disable
+        -fexceptions with CFLAGS_DISABLE_FEXCEPTIONS.
+      - debian/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+    - debian/patches/handle_spaces_in_rev_attr.patch: update patch to apply the
+      change to the right line (LP: #1492425)
+    - debian/initramfs/local-premount: wait for udev to settle before the call
+      to resolve_device() in local_mount_root(), so the by-uuid/ symlinks have
+      a chance to be updated by the multipath udev rules (LP: #1503286).
+    - debian/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+      from the old device names with device numbers to using letters for devices.
+    - debian/patches/mpath_name_migration.patch: ship a multipath_migrate binary
+      to make translation from pre-0.5.0 device naming to the new scheme.
+    - debian/initramfs/hooks: install multipathd and required directories.
+    - debian/initramfs/local-premount: reload all maps to make sure they're
+      indeed loaded and ready before we end premount.
+    - debian/initramfs/local-top: run multipathd rather than a one-off call to
+      multipath so that new paths can be correctly added as detected while we're
+      still in the initramfs.
+    - debian/initramfs/local-bottom: remember to stop multipathd.
+    - debian/rules: install debian/initramfs/local-bottom
+    - debian/patches/0053-readonly-bindings_multipathd_prod.patch: support -B to
+      allow multipathd to handle cases where the bindings file is read-only.
+      (LP: #1526984)
+    - debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal
+      with spaces in device names in kpartx too (LP: #1432062)
+    - debian/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+      where uploads might break kpartx's loopback file handling.
+    - debian/patches/kpartx_more_loopback_fixes.patch: fix loopback mounted
+      files some more: since we stat() the loopback device node, we can't rely
+      on S_ISREG() tests to handle this case, and should look at the device
+      itself instead. (LP: #1543430)
+    - Remove partition device nodes of individual paths (for LVM on multipath)
+      (LP: #1540401)
+      - debian/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+      - debian/initramfs/hooks: copy the udev rule and partx to the initramfs.
+      - debian/initramfs/init-top: load the dm-multipath module for 'multipath -c'.
+      - debian/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+    - debian/rules: don't ship 95-multipath.rules udev rules anymore; they are
+      not necessary with multipath-tools listening for udev events directly.
+  * Drop changes:
+    - debian/patches/series: Drop obsolete patches already included upstream
+      - debian/patches/ignore_devices_nodename_fail.patch
+      - debian/patches/skip_usb_devices.patch
+      - debian/patches/0014-kpartx-long-path.patch
+      - debian/patches/0052-readonly-bindings_multipathd.patch
+      - debian/patches/add_find-multipaths.patch
+      - debian/patches/dm-multipath-backlist-nvme-5c412e47.patch
+
+ -- Ryan Harper <[e-mail]>  Wed, 09 Mar 2016 10:21:26 -0600
+
 multipath-tools (0.5.0+git1.656f8865-5) unstable; urgency=medium
 
   * [e91ac62] Fix build to properly generate the arch-independent
@@ -243,6 +641,190 @@ multipath-tools (0.5.0+git0.770e6d0d-1) experimental; urgency=medium
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sun, 09 Aug 2015 14:42:48 +0530
 
+multipath-tools (0.5.0-7ubuntu16) xenial; urgency=medium
+
+  * debian/patches/dm-multipath-backlist-nvme-5c412e47.patch: blacklist NVMe
+    from multipath, otherwise kpartx calls will hang. This is because mpath
+    works at the request level (which NVMe bypasses), so multipathing is not
+    supported on NVMe. (LP: #1551828)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 01 Mar 2016 11:55:13 -0500
+
+multipath-tools (0.5.0-7ubuntu15) xenial; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Remove partition device nodes of individual paths (for LVM on multipath)
+    (LP: #1540401)
+    - debian/multipath-tools.dm-mpath-lvm.udev: udev rule for that.
+    - debian/initramfs/hooks: copy the udev rule and partx to the initramfs.
+    - debian/initramfs/init-top: load the dm-multipath module for 'multipath -c'.
+    - debian/rules: install the udev rule (priority 56: after 55-scsi-sg3_id)
+  * debian/rules: don't ship 95-multipath.rules udev rules anymore; they are
+    not necessary with multipath-tools listening for udev events directly.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 11 Feb 2016 19:08:14 -0500
+
+multipath-tools (0.5.0-7ubuntu14) xenial; urgency=medium
+
+  * debian/patches/kpartx_more_loopback_fixes.patch: fix loopback mounted
+    files some more: since we stat() the loopback device node, we can't rely
+    on S_ISREG() tests to handle this case, and should look at the device
+    itself instead. (LP: #1543430)
+  * debian/tests/kpartx-file-loopback: check for left-over loop devices after
+    deleting a map.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 09 Feb 2016 15:24:27 -0500
+
+multipath-tools (0.5.0-7ubuntu13) xenial; urgency=medium
+
+  * Check that losetup -f is the same in the autopkgtest, after a cycle of
+    kpartx -a/-d. Looks like it's currently failing to cleanup loop0 in
+    addition to cleaning loop0p1. See http://pad.lv/1543430
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 09 Feb 2016 06:51:15 +0000
+
+multipath-tools (0.5.0-7ubuntu12) xenial; urgency=medium
+
+  * Use synchronous kpartx calls in the adt tests, to hopefully avoid
+    kernel/userspace races which result in failure to remove mapped
+    partitions. Also invoke udevadm settle.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 02 Feb 2016 20:26:34 +0000
+
+multipath-tools (0.5.0-7ubuntu11) xenial; urgency=medium
+
+  * debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: fixup
+    to correct deal with loopback-mounting files. (LP: #1540660)
+  * debian/patches/mpath_name_migration.patch: make sure multipath_migrate gets
+    cleaned up otherwise running debuild twice will fail.
+  * debian/tests/kpartx-file-loopback: add an autopkgtest to catch future cases
+    where uploads might break kpartx's loopback file handling.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 01 Feb 2016 23:27:08 -0500
+
+multipath-tools (0.5.0-7ubuntu10) xenial; urgency=medium
+
+  * debian/patches/0052-readonly-bindings_multipathd.patch,
+    debian/patches/0053-readonly-bindings_multipathd_prod.patch: support -B to
+    allow multipathd to handle cases where the bindings file is read-only.
+    (LP: #1526984)
+  * debian/initramfs/hooks: install multipathd and required directories.
+  * debian/initramfs/local-bottom, debian/rules: install local-bottom for
+    initramfs.
+  * debian/initramfs/local-premount: reload all maps to make sure they're
+    indeed loaded and ready before we end premount.
+  * debian/initramfs/local-top: run multipathd rather than a one-off call to
+    multipath so that new paths can be correctly added as detected while we're
+    still in the initramfs.
+  * debian/initramfs/local-bottom: remember to stop multipathd.
+  * debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch: deal
+    with spaces in device names in kpartx too (LP: #1432062)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 27 Jan 2016 10:42:51 -0500
+
+multipath-tools (0.5.0-7ubuntu9) xenial; urgency=medium
+
+  * d/p/lp1503305_libmultipath_info_on_1st_path_down_dbd131e.patch:
+    Correctly display the vendor/model info on path line in output if the
+    first path of a path group is failed. (LP: #1503305)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 03 Nov 2015 18:34:09 -0600
+
+multipath-tools (0.5.0-7ubuntu8) xenial; urgency=medium
+
+  * debian/multipath-tools.postinst: handle upgrades from < 0.5.0 by migrating
+    from the old device names with device numbers to using letters for devices.
+  * debian/patches/mpath_name_migration.patch: ship a multipath_migrate binary
+    to make translation from pre-0.5.0 device naming to the new scheme.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 22 Oct 2015 12:38:45 +0100
+
+multipath-tools (0.5.0-7ubuntu7) wily; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * debian/initramfs/local-premount: wait for udev to settle before the call
+    to resolve_device() in local_mount_root(), so the by-uuid/ symlinks have
+    a chance to be updated by the multipath udev rules (LP: #1503286).
+
+ -- Steve Langasek <[e-mail]>  Mon, 19 Oct 2015 22:56:58 -0700
+
+multipath-tools (0.5.0-7ubuntu6) wily; urgency=medium
+
+  * debian/patches/handle_spaces_in_rev_attr.patch: update patch to apply the
+    change to the right line (LP: #1492425)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Fri, 18 Sep 2015 10:16:50 -0400
+
+multipath-tools (0.5.0-7ubuntu5) wily; urgency=medium
+
+  * debian/patches/0014-kpartx-long-path.patch: have kpartx match loopback
+    files by device and inode rather than by path, as paths are not complete
+    enough to do specific matching for long paths (> 64 chars) or relative
+    paths. (LP: #1469143)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 17 Sep 2015 11:10:38 -0400
+
+multipath-tools (0.5.0-7ubuntu4) wily; urgency=medium
+
+  * Disable -fexceptions on multipath-udeb (LP: #1489379): the flag causes
+    libchecktur.so to link with libgcc_s.so.1 (even with -static-libgcc),
+    which is not available in the installer environment.
+    - debian/patches/disable-fexceptions-udeb.patch: conditionally disable
+      -fexceptions with CFLAGS_DISABLE_FEXCEPTIONS.
+    - debian/rules: set CFLAGS_DISABLE_FEXCEPTIONS to build multipath-udeb.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Thu, 03 Sep 2015 07:29:59 -0400
+
+multipath-tools (0.5.0-7ubuntu3) wily; urgency=medium
+
+  * debian/initramfs/hooks: also copy wwids file on the installed system to
+    ensure all paths come up on boot. (LP: #1479929)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 30 Jul 2015 16:34:28 -0400
+
+multipath-tools (0.5.0-7ubuntu2) wily; urgency=medium
+
+  * debian/patches/add_find-multipaths.patch: properly handle local non-mpath
+    devices. (LP: #1463046)
+  * debian/patches/ignore_devices_nodename_fail.patch: ignore devices for which
+    sysfs_get_tgt_nodename fails.
+  * debian/patches/skip_usb_devices.patch: skip USB devices during discovery.
+    (LP: #1468897) 
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 10 Jul 2015 15:53:37 -0400
+
+multipath-tools (0.5.0-7ubuntu1) wily; urgency=medium
+
+  * Merge from debian unstable, remaining changes: (LP: #1455482)
+    - control:
+      * Bump debhelper dependency to install udev rules to
+        /lib/udev/rules.d, bump udev dependencies as well.
+    - initramfs/hooks: use 95 not 60 for multipath rules priority
+    - multipath-tools-boot.init: remove in favor of kpartx.udev rules (at top)
+    - multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - debian/initramfs/local-top: wait for udev to settle before running
+      'multipath' in order to avoid race condition on device-mapper calls. 
+    - debian/initramfs/local-top: remove '--timeout 10' which causes my
+      test system to not boot roughly 3 out of 4 times.
+    - Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+    - Added debian/patches/0015-shared-lock-for-udev.patch (LP: #1431650)
+  * debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch: add
+    SCSI_IDENT_* properties to blacklist exceptions, so that we can have QEMU
+    multipathed devices as well as others (IBM IPR) detected properly as
+    multipathed devices.
+  * debian/patches/handle_spaces_in_rev_attr.patch: support IBM IPR devices
+    and others which may have only spaces for the rev attribute.
+  * debian/patches/path_selector.patch: switch the default path selector
+    back to round-robin while service-time isn't available to the installer
+    multipath-modules.
+  * debian/control: add sg3-udeb to multipath-udeb Depends.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 06 Jul 2015 13:15:22 -0400
+
 multipath-tools (0.5.0-7) unstable; urgency=medium
 
   * [15ecad9] Add dm-service-time path checker.
@@ -394,6 +976,100 @@ multipath-tools (0.4.9+git0.4dfdaf2b-1) experimental; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 10 Feb 2012 18:25:29 +0530
 
+multipath-tools (0.4.9-3ubuntu12) vivid; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Support disks with non 512-byte sectors (LP: #1441930)
+    - Added 0016-kpartx-non-512B-GPT.patch
+    - Added 0017-kpartx-non-512B-sectors.patch
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/0018-ext-part-gt-512B-sectors.patch: fix extended partition
+    size for > 512B sectors. Patch cherry-picked from git commit 7202f225.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 13 Apr 2015 09:23:29 -0500
+
+multipath-tools (0.4.9-3ubuntu11) vivid; urgency=medium
+
+  [ Mauricio Faria de Oliveira ]
+  * Added debian/patches/0015-shared-lock-for-udev.patch (LP: #1431650)
+  * debian/initramfs/local-top: wait for udev to settle before running
+    'multipath' in order to avoid race condition on device-mapper calls. 
+
+  [ Mathieu Trudel-Lapierre ]
+  * Drop scsi_wait_scan from the multipath initramfs script: that module
+    no longer exists.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 23 Mar 2015 14:56:37 -0400
+
+multipath-tools (0.4.9-3ubuntu10) utopic; urgency=medium
+
+  * 1002-fix-linking-library.patch: Move $(LIBDEPS) to the end of the
+    link line to fix underlinking with ld --as-needed (LP: #1004243)
+
+ -- Adam Conrad <[e-mail]>  Mon, 13 Oct 2014 07:47:07 -0600
+
+multipath-tools (0.4.9-3ubuntu9) utopic; urgency=medium
+
+  * Added 0011-libmultipath-update-waiter-handling.patch (LP: #1354114)
+  * Added 0012-Race-condition-when-calling-stop_waiter_thread.patch (LP: #1354114)
+  * Added 0013-multipath-clean-up-code-for-stopping-the-waiter-thre.patch (LP: #1354114)
+  * Added 0014-Fix-race-condition-in-stop_waiter_thread.patch (LP: #1354114)
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 02 Sep 2014 15:43:38 -0700
+
+multipath-tools (0.4.9-3ubuntu8) utopic; urgency=medium
+
+  * Remove RUN+="socket:" statement in rules file since it is
+    no longer supported after version 178 (LP: #1240049)
+
+ -- Seyeong Kim <[e-mail]>  Fri, 18 Jul 2014 10:37:35 +0200
+
+multipath-tools (0.4.9-3ubuntu7) raring; urgency=low
+
+  * Add 0010-fix-extended-partitions.patch: Only expose the
+    first two sectors of the extended partition (LP: #1093918).
+
+ -- Phillip Susi <[e-mail]>  Fri, 04 Jan 2013 16:14:34 -0500
+
+multipath-tools (0.4.9-3ubuntu6) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Fri, 05 Oct 2012 14:00:37 +0100
+
+multipath-tools (0.4.9-3ubuntu5) precise; urgency=low
+
+  * Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)
+
+ -- Phillip Susi <[e-mail]>  Tue, 20 Mar 2012 15:26:22 -0400
+
+multipath-tools (0.4.9-3ubuntu4) precise; urgency=low
+
+  * Restore multipath-udeb dependency on multipath-modules (LP: #959749).
+
+ -- Colin Watson <[e-mail]>  Wed, 21 Mar 2012 14:34:01 +0000
+
+multipath-tools (0.4.9-3ubuntu3) precise; urgency=low
+
+  * Move kpartx from multipath-udeb to a new kpartx-udeb package
+    (LP: #922646).
+
+ -- Colin Watson <[e-mail]>  Fri, 27 Jan 2012 23:04:23 +0000
+
+multipath-tools (0.4.9-3ubuntu2) precise; urgency=low
+
+  * Add 0009-fix-delim.patch: The 'p' delimiter was being added
+    when it shouldn't.
+
+ -- Phillip Susi <[e-mail]>  Sun, 08 Jan 2012 20:57:47 -0500
+
+multipath-tools (0.4.9-3ubuntu1) precise; urgency=low
+
+  * Merge with Debian (for remaining changes, see 0.4.9-2ubuntu1).
+
+ -- Matthias Klose <[e-mail]>  Sun, 04 Dec 2011 21:32:48 +0100
+
 multipath-tools (0.4.9-3) unstable; urgency=low
 
   * [dd85b8b] Add example to kpartx manpage. Committed upstream.
@@ -407,6 +1083,36 @@ multipath-tools (0.4.9-3) unstable; urgency=low
 
  -- Ritesh Raj Sarraf <[e-mail]>  Sat, 03 Dec 2011 19:34:59 +0530
 
+multipath-tools (0.4.9-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - control:
+      * Bump debhelper dependency to install udev rules to
+       /lib/udev/rules.d, bump udev dependencies as well.
+      * multipath-udeb must not depend on multipath-modules, 
+        because the Ubuntu kernel already includes the modules and no 
+        package provides m-m.
+    - initramfs/hooks: use 95 not 60 for multipath rules priority
+    - multipath-tools-boot.init: remove in favor of kpartx.udev rules (at top)
+    - kpartx.udev:
+      * add rule to load dm-multipath
+      * use whole path when running /usr/lib/dmsetup_env
+      * call kpartx through dmsetup for mpath-* devices
+      * switch $name for $kernel for dmraid rule
+    - multipath-tools.preinst: modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+    - Have initramfs local-top start with scsi_wait_scan, and make sure all
+      devices have been found before bothering to call udevadm settle.
+    - debian/initramfs/local-top: wait for scsi_wait_scan
+  * *.install: use /lib*/ instead of /lib/ to catch /lib64
+  * debian/initramfs/local-top: remove '--timeout 10' which causes my
+    test system to not boot roughly 3 out of 4 times.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 06 Jun 2011 12:31:23 -0500
+
 multipath-tools (0.4.9-2) unstable; urgency=low
 
   * [2544655] wait harder for multipath init. Thanks to Serge Hallyn for
@@ -581,6 +1287,108 @@ multipath-tools (0.4.8-15) unstable; urgency=low
 
  -- Guido Günther <[e-mail]>  Mon, 06 Apr 2009 19:36:25 +0200
 
+multipath-tools (0.4.8-14ubuntu11) oneiric; urgency=low
+
+  * Fixes some return logic issues in the blacklist.c:_filter_path function
+    where using blacklist and blacklist_exceptions would cause multipathd to
+    improperly filter paths. (LP: #789229)
+    - The patch was created by Christophe Varoqui in 2007.
+      + http://www.redhat.com/archives/dm-devel/2007-November/msg00054.html
+      + 0013-libmultipath-filter_path-fix_blacklist_filter_exit.patch
+    - [serge-hallyn] swap in the whole upstream git commit and call it
+      0013-blacklist_exception_issues.patch.
+
+ -- Craig Magina <[e-mail]>  Fri, 27 May 2011 11:47:19 -0400
+
+multipath-tools (0.4.8-14ubuntu10) natty; urgency=low
+
+  * pass '-p part' to kpartx in initramfs script, not '-p p', to
+    make sure /dev/mapper/ names are formed as expected.  (LP: #712840)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 03 Feb 2011 18:40:36 -0600
+
+multipath-tools (0.4.8-14ubuntu9) natty; urgency=low
+
+  * Fix segv caused by race condition with free_waiter threads during
+    shutdown, using backport from upstream.  (LP: #713237)
+
+ -- dann frazier <[e-mail]>  Thu, 03 Feb 2011 16:37:10 -0700
+
+multipath-tools (0.4.8-14ubuntu8) natty; urgency=low
+
+  * Fix segv on shutdown when log buffer is empty, using patch cherry-picked
+    from upstream.  (LP: #488285)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 01 Feb 2011 15:38:36 -0600
+
+multipath-tools (0.4.8-14ubuntu7) natty; urgency=low
+
+  * Add patch to fix the expected pathname from multipath uevents
+    (LP: #660597)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 16:06:29 -0600
+
+multipath-tools (0.4.8-14ubuntu6) natty; urgency=low
+
+  * Fix in debian/kpartx.udev:
+      - modprobe -q instead of incorrect modprobe -Q (LP: #644481)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 15:58:13 -0600
+
+multipath-tools (0.4.8-14ubuntu5) natty; urgency=low
+
+  * Make the initramfs local-top script wait until all devices
+    are mapped, to make sure no /dev/sd* get mounted before
+    multipath has a chance to take it. (LP: #686832)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 04 Jan 2011 15:55:48 -0600
+
+multipath-tools (0.4.8-14ubuntu4) lucid; urgency=low
+
+  * debian/control: Move libreadline5-dev build dependency to libreadline-dev.
+    (Already done in Debian).
+
+ -- Martin Pitt <[e-mail]>  Mon, 08 Mar 2010 14:50:04 +0100
+
+multipath-tools (0.4.8-14ubuntu3) lucid; urgency=low
+
+  * Support failback for Intel Modular Server (LP: #520309).
+
+ -- Colin Watson <[e-mail]>  Fri, 12 Feb 2010 12:21:42 +0000
+
+multipath-tools (0.4.8-14ubuntu2) jaunty; urgency=low
+
+  * debian/kpartx.udev: Let dmsetup run kpartx, since $kernel doesn't map
+    right.
+  * debian/initramfs/hooks: Include /lib/udev/kpartx_id.
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 10 Mar 2009 11:54:01 +0200
+
+multipath-tools (0.4.8-14ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - control:
+     + Bump debhelper dependency to install udev rules to
+      /lib/udev/rules.d, bump udev dependencies as well.
+     + multipath-udeb must not depend on multipath-modules, 
+      because the Ubuntu kernel already includes the modules and no 
+      package provides m-m.
+    - initramfs/hooks: Install rules from /lib/udev/rules.d.
+    - kpartx.udev, multipath-tools-boot.init:
+      Replace multipath-tools-boot init script with udev rules.
+    - multipath-tools.preinst: Fix preinst script to modprobe dm-multipath.
+      This will make sure that multipathd will be able to start.
+    - multipath-tools.prerm: Add prerm script to not fail when upgrading
+      from a broken version of multipathd.
+    - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.
+    - rules: Move udev rules to priority 95, because rules that load
+      modules should be >90.
+  * Fix bugs (LP: #316851, #320156)
+  * multipath-tools.prerm/preinst: Remove checks for old ubuntu
+    versions, we don't support upgrading from them anymore.
+  
+ -- Timo Aaltonen <[e-mail]>  Thu, 12 Feb 2009 15:07:42 +0200
+
 multipath-tools (0.4.8-14) unstable; urgency=low
 
   * [6dad4a0] kpartx: use uint64_t to account slices start/size based on
@@ -643,6 +1451,64 @@ multipath-tools (0.4.8-11) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Wed, 30 Jul 2008 17:59:03 -0400
 
+multipath-tools (0.4.8-10ubuntu6) jaunty; urgency=low
+
+  * debian/multipath-tools.preinst: Use the same logic as in
+    hw-detect to determine if dm_multipath is already loaded.
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 15 Jan 2009 23:50:18 +0200
+
+multipath-tools (0.4.8-10ubuntu5) jaunty; urgency=low
+
+  * debian/initramfs/hooks: Install from /lib/udev/rules.d 
+
+ -- Scott James Remnant <[e-mail]>  Tue, 13 Jan 2009 03:05:02 +0000
+
+multipath-tools (0.4.8-10ubuntu4) jaunty; urgency=low
+
+  * Bump debhelper dependency to install udev rules to /lib/udev/rules.d,
+    bump udev dependencies as well. 
+
+ -- Scott James Remnant <[e-mail]>  Mon, 12 Jan 2009 22:03:11 +0000
+
+multipath-tools (0.4.8-10ubuntu3) jaunty; urgency=low
+
+  * fix_udev_scsi_id_arguments.diff:
+    Update the arguments for scsi_id. (LP: #306723)
+  * fix_sysfs_layout.diff:
+    Patch from upstream to use the new sysfs layout. (LP: #307032)
+
+ -- Timo Aaltonen <[e-mail]>  Thu, 18 Dec 2008 15:32:20 +0200
+
+multipath-tools (0.4.8-10ubuntu2) jaunty; urgency=low
+
+  * debian/control: multipath-udeb must not depend on multipath-modules, 
+    because the Ubuntu kernel already includes the modules and no 
+    package provides m-m.
+  * debian/multipath-tools.preinst: Don't modprobe dm-multipath 
+    unconditionally, since it'll break during installation (no 
+    modprobe.dep) and when using a monolithic kernel. Instead check for 
+    these conditions. (LP: #182009)
+
+ -- Timo Aaltonen <[e-mail]>  Tue, 02 Dec 2008 12:28:08 +0200
+
+multipath-tools (0.4.8-10ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Fix init script not to die on stop if multipathd is not running.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+
+ -- Soren Hansen <[e-mail]>  Thu, 26 Jun 2008 08:55:33 +0200
+
 multipath-tools (0.4.8-10) unstable; urgency=low
 
   * [183da2c] Add russion debconf translation (Closes: #486353) - thanks
@@ -676,6 +1542,32 @@ multipath-tools (0.4.8-8) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Sun, 09 Mar 2008 18:55:38 +0100
 
+multipath-tools (0.4.8-7ubuntu2) hardy; urgency=low
+
+  * Install udev rules in initramfs.
+  * Use temporary device name for creating partitions using kpartx.
+  * Big thanks to Dag Stenstad for testing and helping with debugging!
+
+ -- Soren Hansen <[e-mail]>  Wed, 19 Mar 2008 19:07:22 +0100
+
+multipath-tools (0.4.8-7ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - DebianMaintainerField.
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear.
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+  * Dropped our hsg80 changes. Kernel handles this correctly now.
+
+ -- Soren Hansen <[e-mail]>  Mon, 28 Jan 2008 11:09:45 +0100
+
 multipath-tools (0.4.8-7) unstable; urgency=low
 
   * add watch file
@@ -697,6 +1589,26 @@ multipath-tools (0.4.8-6) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Sat, 01 Dec 2007 15:41:36 +0100
 
+multipath-tools (0.4.8-5ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - DebianMaintainerField.
+    - Suggest sg3-utils, Conflict with sg-utils.
+    - Replace multipath-tools-boot init script with udev rules in
+      kpartx.rules.
+    - Add /sbin/hsg80_start.
+    - Move udev rules to priority 95, and drop call to dmsetup_env.
+    - Add devices as they appear
+    - Fix preinst script to modprobe dm-multipath. This will make sure
+      that multipathd will be able to start.
+    - Fix init script not to die on stop if multipathd is not running.
+    - Add prerm script to not fail when upgrading from a broken version of
+      multipathd.
+    - Set umask in multipathd.
+    - Handle udev rules priority change in preinst.
+
+ -- Soren Hansen <[e-mail]>  Thu, 13 Dec 2007 03:03:31 +0100
+
 multipath-tools (0.4.8-5) unstable; urgency=low
 
   * apply kpartx-fix-udev-dmraid.diff to our shipped udev rules too
@@ -811,6 +1723,34 @@ multipath-tools (0.4.7-3) experimental; urgency=low
 
  -- Guido Guenther <[e-mail]>  Fri, 08 Jun 2007 11:51:00 +0200
 
+multipath-tools (0.4.7-2ubuntu3) gutsy; urgency=low
+
+  * Fix preinst script to modprobe dm-multipath. This will make sure
+    that multipathd will be able to start.
+
+  * Fix init script not to die on stop if multipathd is not running.
+
+  * Add prerm script to not fail when upgrading from a broken version of
+    multipathd.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 10 Aug 2007 13:03:39 +0200
+
+multipath-tools (0.4.7-2ubuntu2) gutsy; urgency=low
+  
+  * Fix udev rule to load dm-multipath.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 13 Jun 2007 11:56:52 +0200
+
+multipath-tools (0.4.7-2ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Remove multipath-tools-boot init script in favour of udev rules.
+    - Update udev rules as described in 0.4.7-1.1ubuntu3.
+    - Add /sbin/hsg80_start as described in 0.4.7-1.1ubuntu3.
+    - debian/control Ubuntu maintainer foobar.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 16 May 2007 11:02:20 +0200
+
 multipath-tools (0.4.7-2) unstable; urgency=low
 
   [ Bastian Blank ]
@@ -828,6 +1768,42 @@ multipath-tools (0.4.7-2) unstable; urgency=low
 
  -- Guido Guenther <[e-mail]>  Wed, 20 Dec 2006 17:40:59 +0100
 
+multipath-tools (0.4.7-1.1ubuntu3) feisty; urgency=low
+
+  * Remove multipath-tools-boot init script.
+
+  * Wild changes and updates to udev rules:
+    - All the hsg80 MULTIBUS FAILOVER are now handled here.
+    - Fix rule to call kpartx also on "change" udev events.
+    - Invoke multipath -v 0 device to make sure we hot plug
+      all devices into multipath.
+
+  * Add /sbin/hsg80_start that wraps all the work to make an hsg80 in
+    MULTIBUS FAILOVER working properly.
+    This is automatically called by udev.
+
+  (Closes LP: #98518)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 04 Apr 2007 08:17:48 +0200
+
+multipath-tools (0.4.7-1.1ubuntu2) feisty; urgency=low
+
+  * Remove devmap_name from this package, and Depend on dmsetup instead.
+    Fixes file overwrite conflict with dmsetup.  (LP 84894.)
+
+ -- Ian Jackson <[e-mail]>  Tue, 13 Feb 2007 16:16:46 +0000
+
+multipath-tools (0.4.7-1.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove stop links from rc0 and rc6
+    - suggest sg3-utils, conflict sg-utils
+    - fix path to scsi_id
+    - ubuntu udev rules
+    - set umask
+
+ -- Scott James Remnant <[e-mail]>  Tue, 28 Nov 2006 15:24:16 +0000
+
 multipath-tools (0.4.7-1.1) unstable; urgency=medium
 
   * Added missing dependency on dmsetup.  Closes: #381068.
@@ -840,6 +1816,77 @@ multipath-tools (0.4.7-1.1) unstable; urgency=medium
 
  -- John Goerzen <[e-mail]>  Wed,  9 Aug 2006 11:52:08 -0500
 
+multipath-tools (0.4.7-1ubuntu8) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 15 Sep 2006 17:30:19 +0100
+
+multipath-tools (0.4.7-1ubuntu7) dapper; urgency=low
+
+  * Fix typo in init script that was executing hsg80_init unconditionally.
+
+  * Suggests: sg3-utils and Conflicts: sg-utils (obsoleted).
+
+ -- Fabio M. Di Nitto <[e-mail]>  Mon, 22 May 2006 09:56:07 +0200
+
+multipath-tools (0.4.7-1ubuntu6) dapper; urgency=low
+
+  * no changes upload to rebuild with new libdevmapper.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 10 May 2006 09:31:20 +0200
+
+multipath-tools (0.4.7-1ubuntu5) dapper; urgency=low
+
+  The "give Scott a crying biscuit" release.
+
+  * Apply patch from Dennis Kaarsemaker.
+  (Closes Ubuntu: #41318)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 26 Apr 2006 10:20:07 +0200
+
+multipath-tools (0.4.7-1ubuntu4) dapper; urgency=low
+
+  * Remove 2 extra lines from multipath.rules that were really not supposed
+    to be there.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 06 Apr 2006 17:43:10 +0200
+
+multipath-tools (0.4.7-1ubuntu3) dapper; urgency=low
+
+  * Add hsg80_init function to multipath-tools-boot init script.
+    The script takes care to perform a proper initialization of the disks
+    when the hsg80 is configured in multibus failover mode.
+
+    NOTE: multipathd is not able to understand properly what happens in this
+    multi-bugs situation and it will require manual kill and restart once
+    the disks have been readded to the system, otherwise failover is not
+    guaranteed and syslog will be flooded.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 06 Apr 2006 09:33:51 +0200
+
+multipath-tools (0.4.7-1ubuntu2) dapper; urgency=low
+
+  * Fix socket permissions.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 04 Apr 2006 18:20:20 +0200
+
+multipath-tools (0.4.7-1ubuntu1) dapper; urgency=low
+
+  * Fix path to scsi_id.
+
+  * Make install: target depends on build in debian/rules.
+
+  * Change NAME to multipathd in init scripts so that we can actually stop
+    multipathd.
+
+  * Swap multipath-tools-boot and multipath-tools init scripts order in
+    postinst and make multipath-tools-boot start.
+
+  * UVF exception granted by Colin Watson.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 04 Apr 2006 06:31:09 +0200
+
 multipath-tools (0.4.7-1) unstable; urgency=low
 
   * New upstream version. 
diff --git a/debian/control b/debian/control
index 37c02da..5f39b20 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: multipath-tools
 Section: admin
 Priority: extra
-Maintainer: Debian LVM Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian LVM Team <[e-mail]>
 Uploaders: Guido Günther <[e-mail]>, Ritesh Raj Sarraf <[e-mail]>
 Build-Depends: debhelper (>= 9), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, libaio-dev, dpkg-dev (>= 1.16.1~), libudev-dev, libsystemd-dev, systemd, dh-systemd, liburcu-dev, librados-dev
 Vcs-Git: https://anonscm.debian.org/git/pkg-lvm/multipath-tools.git
@@ -13,7 +14,7 @@ Package: multipath-tools
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 136-1), kpartx (>= ${binary:Version}), lsb-base (>= 3.0-6), libaio1 (>= 0.3.106-8), sg3-utils-udev
 Breaks: multipath-tools-initramfs (<= 1.0.1),
- multipath-tools-boot (<= 0.4.8+git0.761c66f-2~)
+ multipath-tools-boot (<< 0.6.3-2ubuntu1)
 Suggests: multipath-tools-boot
 Description: maintain multipath block device access
  These tools are in charge of maintaining the disk multipath device maps and
@@ -30,12 +31,20 @@ Description: create device mappings for partitions
  Kpartx can be used to set up device mappings for the partitions of any
  partitioned block device. It is part of the Linux multipath-tools.
 
+Package: kpartx-boot
+Architecture: all
+Depends: ${misc:Depends}, initramfs-tools,
+ kpartx (>= ${source:Version}), kpartx (<< ${source:Version}.1~)
+Description: Provides kpartx during boot
+ This package makes kpartx available during boot to activate partitions
+
 Package: multipath-tools-boot
 Architecture: all
 Depends: ${misc:Depends}, initramfs-tools, lsb-base (>= 3.0-6),
- multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~)
-Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.5.0+git1.656f8865-6)
-Breaks: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.5.0+git1.656f8865-6)
+ multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~),
+ kpartx-boot (= ${binary:Version})
+Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.6.4-3ubuntu1)
+Breaks: multipath-tools-initramfs (<< 1.0.1+nmu1), multipath-tools (<< 0.6.4-3ubuntu1)
 Description: Support booting from multipath devices
  This package contains the necessary support for booting from a multipath
  device:
@@ -49,7 +58,7 @@ Description: Support booting from multipath devices
 Package: multipath-udeb
 Package-Type: udeb
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules, kpartx-udeb
+Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules, kpartx-udeb, sg3-udeb
 Section: debian-installer
 Description: maintain multipath block device access - udeb package
  This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/initramfs/hooks b/debian/initramfs/hooks
index bddfb9d..22c853f 100644
--- a/debian/initramfs/hooks
+++ b/debian/initramfs/hooks
@@ -25,9 +25,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-lvm.rules; do
     if [ -e /lib/udev/rules.d/$rules ]; then
       cp -p /lib/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
     fi
@@ -43,12 +51,24 @@ mkdir -p $DESTDIR/lib/multipath/
 for x in /lib/multipath/*; do
     copy_exec $x /lib/multipath/
 done
+copy_exec /usr/bin/partx
 add_udev_rules
 
+copy_exec /sbin/multipathd 		/sbin
+# multipathd requires libgcc_s.so.1 (not handled by copy_exec() as it's dlopen()'ed).
+# hack: find libgcc_s.so.1 via ldconfig cache (dpkg-architecture pulls lots of deps).
+for x in $(ldconfig --print-cache | grep -o '/lib/.*/libgcc_s\.so\.1'); do
+    copy_exec $x $(dirname $x)
+done
+
+# multipathd requires /run/multipathd.pid
+mkdir -p $DESTDIR/run
+
 [ -r /etc/multipath.conf ] && cp /etc/multipath.conf $DESTDIR/etc/
 add_bindings
+add_wwids
 
-for x in dm-multipath dm-service-time dm-round-robin; do
+for x in dm-multipath dm-service-time dm-round-robin dm-queue-length; do
 	manual_add_modules ${x}
 done
 
diff --git a/debian/initramfs/init-top b/debian/initramfs/init-top
index 51637e9..883d7f9 100644
--- a/debian/initramfs/init-top
+++ b/debian/initramfs/init-top
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# multipath hardware handler
+# multipath: load modules and daemon
 
 PREREQ=" "
 
@@ -26,7 +26,18 @@ verbose()
 
 maybe_break pre-multipath
 VERBOSITY=0
-HW_HANDLERS=""
+HW_HANDLERS="scsi_dh_alua scsi_dh_rdac scsi_dh_emc"
+MP_MODULES="dm-multipath"
+
+verbose && log_begin_msg "Loading multipath modules"
+for module in ${MP_MODULES}; do
+  if modprobe --syslog "$module"; then
+    verbose && log_success_msg "loaded module ${module}."
+  else
+    log_failure_msg "failed to load module ${module}."
+  fi
+done
+verbose && log_end_msg
 
 verbose && log_begin_msg "Loading multipath hardware handlers"
 for module in ${HW_HANDLERS}; do
@@ -38,6 +49,11 @@ for module in ${HW_HANDLERS}; do
 done
 verbose && log_end_msg
 
+# Start multipathd
+verbose && log_begin_msg "Starting multipathd"
+/sbin/multipathd -B
+verbose && log_end_msg
+
 maybe_break post-multipath
 
 exit 0
diff --git a/debian/initramfs/kpartx.hook b/debian/initramfs/kpartx.hook
new file mode 100644
index 0000000..ead2c77
--- /dev/null
+++ b/debian/initramfs/kpartx.hook
@@ -0,0 +1,20 @@
+#!/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/95-kpartx.rules $DESTDIR/lib/udev/rules.d/
diff --git a/debian/initramfs/local-bottom b/debian/initramfs/local-bottom
new file mode 100644
index 0000000..13026ff
--- /dev/null
+++ b/debian/initramfs/local-bottom
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# multipathd shutdown
+
+PREREQ=""
+
+prereqs() { echo "$PREREQ"; }
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /scripts/functions
+
+verbose()
+{
+  case "$quiet" in y*|Y*|1|t*|T*)
+    return 1;;
+  *)
+    return 0;;
+  esac
+}
+
+maybe_break pre-multipath
+
+if [ ! -e /sbin/multipathd ]; then
+	exit 0
+fi
+
+# Stop multipathd
+verbose && log_begin_msg "Stopping multipathd"
+
+pid_pidof="$(pidof multipathd)"
+pid_file="$(cat /run/multipathd.pid)"
+
+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
+
+# 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
+
+exit 0
+
diff --git a/debian/initramfs/local-premount b/debian/initramfs/local-premount
new file mode 100644
index 0000000..050f97b
--- /dev/null
+++ b/debian/initramfs/local-premount
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+. /scripts/functions
+
+if [ -x /sbin/multipath ]
+then
+	[ "$quiet" != "y" ] && log_begin_msg "Waiting for udev to settle (multipath)"
+	udevadm settle --timeout=121 || true
+	[ "$quiet" != "y" ] && log_end_msg
+fi
+
+multipath -r -v0 -B
+
+exit 0
diff --git a/debian/initramfs/local-top b/debian/initramfs/local-top
deleted file mode 100644
index 37c1dac..0000000
--- a/debian/initramfs/local-top
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# multipath discovery
-
-PREREQ="udev iscsi"
-
-prereqs() { echo "$PREREQ"; }
-
-case $1 in
-prereqs)
-	prereqs
-	exit 0
-	;;
-esac
-
-. /scripts/functions
-
-verbose()
-{
-  case "$quiet" in y*|Y*|1|t*|T*)
-    return 1;;
-  *)
-    return 0;;
-  esac
-}
-
-maybe_break pre-multipath
-VERBOSITY=0
-MP_MODULES="dm-multipath dm-round-robin"
-
-if [ ! -e /sbin/multipath ]; 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
-
-verbose && log_begin_msg "Discovering multipaths"
-/sbin/multipath -v $VERBOSITY
-verbose && log_end_msg
-
-if [ -x /sbin/kpartx -a -x /sbin/dmsetup ]; then
-    /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p -part" >/dev/null
-fi
-
-if [ -x /bin/udevadm ]; then
-    /bin/udevadm settle --timeout=10
-fi
-
-maybe_break post-multipath
-
-exit 0
-
diff --git a/debian/kpartx-boot.postinst b/debian/kpartx-boot.postinst
new file mode 100644
index 0000000..6257dc3
--- /dev/null
+++ b/debian/kpartx-boot.postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+# postinst script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/kpartx-boot.postrm b/debian/kpartx-boot.postrm
new file mode 100644
index 0000000..daca462
--- /dev/null
+++ b/debian/kpartx-boot.postrm
@@ -0,0 +1,45 @@
+#!/bin/sh
+# postrm script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/kpartx.install b/debian/kpartx.install
index eb9431e..c69cb2b 100644
--- a/debian/kpartx.install
+++ b/debian/kpartx.install
@@ -1,4 +1,4 @@
 /usr/share/man/man8/kpartx.8.gz
 /sbin/kpartx
-/lib/udev/kpartx_id
-/lib/udev/dmsetup_env
+/lib*/udev/kpartx_id
+/lib*/udev/dmsetup_env
diff --git a/debian/multipath-tools.dm-mpath-lvm.udev b/debian/multipath-tools.dm-mpath-lvm.udev
new file mode 100644
index 0000000..4698023
--- /dev/null
+++ b/debian/multipath-tools.dm-mpath-lvm.udev
@@ -0,0 +1,26 @@
+# An individual device may be part of a multipath device.
+# In such case, remove its partition device nodes so for
+# LVM to scan/lock/use only the multipath device.
+# - Check it on 'add' uevent.
+# - Check it on 'change' uevent (it may change).
+
+SUBSYSTEM!="block", \
+	GOTO="end_mpath"
+
+ACTION=="remove", \
+	GOTO="end_mpath"
+
+ENV{DEVTYPE}=="partition", \
+	IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH", \
+	GOTO="end_mpath"
+
+PROGRAM=="/sbin/multipath -u $devnode", \
+	ENV{DM_MULTIPATH_DEVICE_PATH}="1", \
+	ENV{ID_FS_TYPE}="mpath_member", \
+	RUN+="/usr/bin/partx -d --nr 1-1024 $devnode", \
+	GOTO="end_mpath"
+
+# Not part of a multipath device.
+ENV{DM_MULTIPATH_DEVICE_PATH}=""
+
+LABEL="end_mpath"
diff --git a/debian/multipath-tools.preinst b/debian/multipath-tools.preinst
index 50f8864..74419d2 100644
--- a/debian/multipath-tools.preinst
+++ b/debian/multipath-tools.preinst
@@ -32,6 +32,10 @@ case "$1" in
     ;;
 esac
 
+if ! dmsetup targets | cut -d' ' -f1 | grep -q '^multipath$'; then
+  modprobe -v dm-multipath || true
+fi
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/patches/1000--set-umask-in-multipathd.patch b/debian/patches/1000--set-umask-in-multipathd.patch
new file mode 100644
index 0000000..2dd83f3
--- /dev/null
+++ b/debian/patches/1000--set-umask-in-multipathd.patch
@@ -0,0 +1,30 @@
+---
+ multipathd/uxlsnr.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/multipathd/uxlsnr.c
++++ b/multipathd/uxlsnr.c
+@@ -20,6 +20,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <poll.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <signal.h>
+ #include "checkers.h"
+@@ -133,10 +134,15 @@
+ 	char *inbuf;
+ 	char *reply;
+ 	sigset_t mask;
++	mode_t mode_mask;
+ 	int old_clients = MIN_POLLS;
+ 
++	mode_mask=umask(0177);
++
+ 	ux_sock = ux_socket_listen(DEFAULT_SOCKET);
+ 
++	umask(mode_mask);
++
+ 	if (ux_sock == -1) {
+ 		condlog(1, "could not create uxsock: %d", errno);
+ 		return NULL;
diff --git a/debian/patches/disable-fexceptions-udeb.patch b/debian/patches/disable-fexceptions-udeb.patch
new file mode 100644
index 0000000..acd33b1
--- /dev/null
+++ b/debian/patches/disable-fexceptions-udeb.patch
@@ -0,0 +1,16 @@
+From: Mauricio Faria de Oliveira <[e-mail]>
+Subject: Make the use of -fexceptions conditional.
+Last-Update: 2015-09-09
+
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -69,5 +69,9 @@
+ LDFLAGS     = $(shell dpkg-buildflags --get LDFLAGS)
+ SHARED_FLAGS	= -shared
+ 
++ifdef CFLAGS_DISABLE_FEXCEPTIONS
++	CFLAGS := $(filter-out -fexceptions,$(CFLAGS))
++endif
++
+ %.o:	%.c
+ 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/debian/patches/enable-find-multipaths.patch b/debian/patches/enable-find-multipaths.patch
new file mode 100644
index 0000000..a491018
--- /dev/null
+++ b/debian/patches/enable-find-multipaths.patch
@@ -0,0 +1,11 @@
+--- a/libmultipath/defaults.h
++++ b/libmultipath/defaults.h
+@@ -17,7 +17,7 @@
+ #define DEFAULT_NO_PATH_RETRY	NO_PATH_RETRY_UNDEF
+ #define DEFAULT_VERBOSITY	2
+ #define DEFAULT_REASSIGN_MAPS	0
+-#define DEFAULT_FIND_MULTIPATHS	0
++#define DEFAULT_FIND_MULTIPATHS	1
+ #define DEFAULT_FAST_IO_FAIL	5
+ #define DEFAULT_DEV_LOSS_TMO	600
+ #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON
diff --git a/debian/patches/kpartx_more_loopback_fixes.patch b/debian/patches/kpartx_more_loopback_fixes.patch
new file mode 100644
index 0000000..239dbcf
--- /dev/null
+++ b/debian/patches/kpartx_more_loopback_fixes.patch
@@ -0,0 +1,40 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Fix kpartx some more to correctly remove loopback devices on delete.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/1543430
+
+Loop devices get created when using kpartx with an image file, but should be
+removed afterwards when using kpartx -d. Unfortunately, the devmapper maps
+did get removed but not the losetup nodes behind it, which were still bound
+to the image file. This is because we re-stat the loop device once we've
+figured which one to use, since otherwise we wouldn't have major and minor
+numbers for a loopback file; yet we need those to create the devmapper maps
+reliably.
+
+Instead of checking if we're dealing with a regular type file (since after
+stat() we'd not have the S_ISREG check succeed since we stat()'ed a device),
+use the loopdev variable. It's equivalent to device but only set if we've been
+called to work on an image.
+
+*update*
+This got partially upstream with the following patch - maybe we can drop it now?:
+commit ed4c3119cc1d6bc6656cf84d1e9c1ab184d87814
+Author: Christian Kastner <[e-mail]>
+Date:   Wed Jul 13 19:23:02 2016 +0200
+    kpartx: Fix check whether to detach loop device
+
+
+---
+ kpartx/kpartx.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -678,7 +678,7 @@
+ 		if (n > 0)
+ 			break;
+ 	}
+-	if (what == LIST && loopcreated && S_ISREG (buf.st_mode)) {
++	if (what == LIST && loopcreated && loopdev) {
+ 		if (fd != -1)
+ 			close(fd);
+ 		if (del_loop(device)) {
diff --git a/debian/patches/series b/debian/patches/series
index dbd7009..3fa01ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,7 @@
 systemd-alias.patch
 disable-systemd-for-udeb.patch
 disable-rados-link-for-udeb.patch
+1000--set-umask-in-multipathd.patch
+disable-fexceptions-udeb.patch
+kpartx_more_loopback_fixes.patch
+enable-find-multipaths.patch
diff --git a/debian/rules b/debian/rules
index 5b00688..8cb25dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ build-stamp: clean-tree
 build-multipath-udeb-stamp:
 	dh_testdir
 
-	DEB_CFLAGS_MAINT_APPEND="-static-libgcc" dh_auto_build -- $(OPTFLAGS) LIB=/lib USE_SYSTEMD=0 USE_RADOS=0
+	DEB_CFLAGS_MAINT_APPEND="-static-libgcc" CFLAGS_DISABLE_FEXCEPTIONS=1 dh_auto_build -- $(OPTFLAGS) LIB=/lib USE_SYSTEMD=0 USE_RADOS=0
 	
 	# store files for install target
 	mkdir -p $(CURDIR)/debian/tmp-multipath-udeb/sbin
@@ -73,8 +73,11 @@ install-indep:
 
 	# initramfs stuff:
 	install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/multipath
-	install -D -m 755 debian/initramfs/local-top \
-		$(INITRAMFS)/scripts/local-top/multipath
+	install -D -m 755 debian/initramfs/kpartx.hook $(CURDIR)/debian/kpartx-boot/usr/share/initramfs-tools/hooks/kpartx
+	install -D -m 755 debian/initramfs/local-premount \
+		$(INITRAMFS)/scripts/local-premount/multipath
+	install -D -m 755 debian/initramfs/local-bottom \
+		$(INITRAMFS)/scripts/local-bottom/multipath
 	install -D -m 755 debian/initramfs/init-top \
 		$(INITRAMFS)/scripts/init-top/multipath
 
@@ -127,8 +130,9 @@ binary-arch: build install
 	dh_lintian -a
 	dh_systemd_enable -pmultipath-tools multipathd.service
 	dh_installinit -pmultipath-tools
-	dh_installudev -pkpartx
+	dh_installudev -pkpartx --priority=95
 	dh_installudev -pmultipath-tools --name=multipath
+	dh_installudev -pmultipath-tools --name=dm-mpath-lvm --priority=56
 	dh_installudev -pmultipath-tools --name=dm-mpath --priority=11
 	dh_link -a lib/systemd/system/multipathd.service \
 		lib/systemd/system/multipath-tools.service