Merge ~raharper/ubuntu/+source/multipath-tools:merge into ~ubuntu-server-dev/ubuntu/+source/multipath-tools:ubuntu/devel

Proposed by Ryan Harper
Status: Needs review
Proposed branch: ~raharper/ubuntu/+source/multipath-tools:merge
Merge into: ~ubuntu-server-dev/ubuntu/+source/multipath-tools:ubuntu/devel
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+288688@code.launchpad.net

Description of the change

multipath-tools (0.5.0+git1.656f8865-5ubuntu1) xenial; urgency=medium

  * Merge from Debian.
    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

To post a comment you must log in.

Unmerged commits

4034c3e... by Ryan Harper

update-maintainer

8be5428... by Ryan Harper

  * debian/rules: disable systemd service; fails to start properly

803e73e... by Ryan Harper

Reword changelog entry for merge

f177137... by Ryan Harper

reconstruct-changelog

c039c0f... by Ryan Harper

merge-changelog

38167ce... by Ryan Harper

  * debian/patches/: Refresh patches to apply against source
    - debian/patches/0015-shared-lock-for-udev.patch
    - debian/patches/0053-readonly-bindings_multipathd_prod.patch
    - debian/patches/1000--set-umask-in-multipathd.patch
    - debian/patches/disable-fexceptions-udeb.patch
    - debian/patches/git-kpartx-support-spaces-in-dev-names-b407050a.patch
    - debian/patches/handle_spaces_in_rev_attr.patch
    - debian/patches/kpartx_more_loopback_fixes.patch
    - debian/patches/mpath_name_migration.patch

81b54df... by Ryan Harper

  * debian/patches/series: Drop obsolete patches already included upstream
    - 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
    - debian/patches/ignore_devices_nodename_fail.patch
    - debian/patches/skip_usb_devices.patch

3281714... by Ryan Harper

  * 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 <email address hidden> Tue, 01 Mar 2016 11:55:13 -0500

3dd7db6... by Ryan Harper

  * debian/rules: don't ship 95-multipath.rules udev rules anymore; they are
    not necessary with multipath-tools listening for udev events directly.

59e778e... by Ryan Harper

  * 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)

Subscribers

People subscribed via source and target branches