Merge ~bryce/ubuntu/+source/multipath-tools:merge-v0.9.4-3-lunar into ubuntu/+source/multipath-tools:debian/sid
| Status: | Work in progress |
|---|---|
| Proposed branch: | ~bryce/ubuntu/+source/multipath-tools:merge-v0.9.4-3-lunar |
| Merge into: | ubuntu/+source/multipath-tools:debian/sid |
| Diff against target: |
2892 lines (+2484/-29) 16 files modified
debian/changelog (+2125/-0) debian/control (+10/-1) debian/initramfs/hooks/multipath (+22/-2) debian/initramfs/kpartx.hook (+22/-0) debian/initramfs/local-bottom (+24/-22) debian/initramfs/local-premount (+30/-0) debian/initramfs/scripts/init-top/multipath (+18/-2) debian/kpartx-boot.postinst (+34/-0) debian/kpartx-boot.postrm (+45/-0) debian/multipath-tools.dm-mpath-lvm.udev (+26/-0) debian/multipath-tools.install (+5/-0) debian/multipath-udeb.install (+8/-0) debian/multipath.conf (+3/-0) debian/patches/enable-find-multipaths.patch (+17/-0) debian/patches/series (+1/-0) debian/rules (+94/-2) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical Server Core Reviewers | Pending | ||
| Canonical Server Reporter | Pending | ||
| Canonical Server | Pending | ||
| Canonical Server packageset reviewers | Pending | ||
| git-ubuntu import | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge of multipath-tools.
There were a number of conflicts during rebase. I believe I sorted them all out, but doublechecks and sanitychecks are very welcomed. A few notes from this:
- The "Split kpartx initramfs" dropped a Pre-Depends line but I think this needs to be kept. From https:/
- As part of our delta we (re-) introduced a clean rule for d/rules, which included a call to debconf-updatepo. Debian silently dropped the debian/po directory in 0.9.0-2 (See https:/
- The ubuntu delta had two CVEs which included patches backported from upstream which are now in the upstream release. However, one of the CVEs also included a couple packaging changes which still seem to be relevant. I'm uncertain why these were added to begin with but they still seem to be valid changes, so I've kept them. I'm not sure if they should though. Also, I'm not sure my phrasing of this in the changelog makes the most sense. So on both counts, review feedback is definitely welcome.
- One task for this merge is to evaluate dropping the kpartx-
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
