Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: multipath-to...@packages.debian.org, z...@debian.org
Control: affects -1 + src:multipath-tools
[ Reason ]
Packaging bugs #1037292 and #1037539 have been discovered after the release,
this update will fix them in stable.
[ Impact ]
#1037539 causes devices underlying mpath devs to be visible to LVM et al,
confusing LVMs device setup.
#1037292 causes multipathd.service fail to start on fresh installs before a
reboot. Upgrades from older versions are not affected, and after a reboot it
also workes just fine.
[ Tests ]
I've manually verified the fixes in stable (and also for unstable).
[ Risks ]
#1037539 is caused by an upstream filename change that went unnoticed.
#1037292 switches back to the approach used in bullseye, which we know works.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
#1037539: fix filename, and make sure package build failes if any of the udev
rules are not found at build time
#1037292: re-add modprobe before starting multipathd. Upstream switched its
approach to module loading, but I think that was somewhat unfinished in 0.9.4.
[ Other info ]
(none)
Thanks,
Chris
diff -Nru multipath-tools-0.9.4/debian/changelog
multipath-tools-0.9.4/debian/changelog
--- multipath-tools-0.9.4/debian/changelog 2023-02-07 11:16:57.000000000
+0100
+++ multipath-tools-0.9.4/debian/changelog 2023-06-24 23:07:02.000000000
+0200
@@ -1,3 +1,14 @@
+multipath-tools (0.9.4-3+deb12u1) bookworm; urgency=medium
+
+ * [cfa5138] Re-add dm-multipath module loading to ExecStartPre
+ (Closes: #1037292)
+ * [1289691] Fail package build if udev rules are missing
+ * [2e45796] Install udev mulitpath.rules again.
+ Thanks to Joshua Huber <jhu...@blockbridge.com> (Closes: #1037539)
+ * [6b05510] debian/gbp.conf: update branch for bookworm
+
+ -- Chris Hofstaedtler <z...@debian.org> Sat, 24 Jun 2023 23:07:02 +0200
+
multipath-tools (0.9.4-3) unstable; urgency=medium
[ Chris Lamb ]
diff -Nru multipath-tools-0.9.4/debian/gbp.conf
multipath-tools-0.9.4/debian/gbp.conf
--- multipath-tools-0.9.4/debian/gbp.conf 2023-02-07 11:16:57.000000000
+0100
+++ multipath-tools-0.9.4/debian/gbp.conf 2023-06-24 23:07:02.000000000
+0200
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
upstream-tag = upstream/%(version)s
-debian-branch = master
+debian-branch = debian/bookworm
debian-tag = debian/%(version)s
debian-tag-msg = %(pkg)s Debian release %(version)s
diff -Nru
multipath-tools-0.9.4/debian/patches/0006-multipathd.service-re-add-ExecStartPre.patch
multipath-tools-0.9.4/debian/patches/0006-multipathd.service-re-add-ExecStartPre.patch
---
multipath-tools-0.9.4/debian/patches/0006-multipathd.service-re-add-ExecStartPre.patch
1970-01-01 01:00:00.000000000 +0100
+++
multipath-tools-0.9.4/debian/patches/0006-multipathd.service-re-add-ExecStartPre.patch
2023-06-24 23:07:02.000000000 +0200
@@ -0,0 +1,28 @@
+From: Chris Hofstaedtler <z...@debian.org>
+Date: Sat, 10 Jun 2023 12:42:40 +0200
+Subject: multipathd.service: re-add ExecStartPre
+
+Upstream commit a1eabea75e8e0f6072f2b655cae25ec473b006c5 removed this,
+claiming the modules-load.d snippet would be enough. Maybe it is on other
+distributions, but Debian does not reload modules-load.d snippets on
+package install. Without this, first time installs would need a reboot
+or manual package loading.
+
+Forwarded: no
+Origin: vendor
+---
+ multipathd/multipathd.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
+index aec62db..ae98034 100644
+--- a/multipathd/multipathd.service
++++ b/multipathd/multipathd.service
+@@ -16,6 +16,7 @@ ConditionVirtualization=!container
+ [Service]
+ Type=notify
+ NotifyAccess=main
++ExecStartPre=-/sbin/modprobe dm-multipath
+ ExecStart=/sbin/multipathd -d -s
+ ExecReload=/sbin/multipathd reconfigure
+ TasksMax=infinity
diff -Nru multipath-tools-0.9.4/debian/patches/series
multipath-tools-0.9.4/debian/patches/series
--- multipath-tools-0.9.4/debian/patches/series 2023-02-07 11:16:57.000000000
+0100
+++ multipath-tools-0.9.4/debian/patches/series 2023-06-24 23:07:02.000000000
+0200
@@ -6,3 +6,4 @@
0009-kpartx-rules-use-Debian-specific-partx-path.patch
0010-multipath.rules-do-not-assume-usrmerged-paths.patch
0012-Reproducible-build.patch
+0006-multipathd.service-re-add-ExecStartPre.patch
diff -Nru multipath-tools-0.9.4/debian/rules multipath-tools-0.9.4/debian/rules
--- multipath-tools-0.9.4/debian/rules 2023-02-07 11:16:57.000000000 +0100
+++ multipath-tools-0.9.4/debian/rules 2023-06-24 23:07:02.000000000 +0200
@@ -39,15 +39,15 @@
override_dh_auto_test:
override_dh_auto_install:
- [ ! -f kpartx/del-part-nodes.rules ] || cp kpartx/del-part-nodes.rules
debian/kpartx.del-part-nodes.udev
- [ ! -f kpartx/dm-parts.rules ] || cp kpartx/dm-parts.rules
debian/kpartx.dm-parts.udev
- [ ! -f kpartx/kpartx.rules ] || cp kpartx/kpartx.rules
debian/kpartx.udev
- [ ! -f multipath/multipath.rules ] || cp multipath/multipath.rules
debian/multipath.udev
- [ ! -f multipath/11-dm-mpath.rules ] || cp multipath/11-dm-mpath.rules
debian/dm-mpath.udev
-
dh_auto_install --sourcedirectory=debian/build-deb --
DESTDIR=$(CURDIR)/debian/tmp
dh_auto_install --sourcedirectory=debian/build-udeb --
DESTDIR=$(CURDIR)/debian/tmp-multipath-udeb
+ cp kpartx/del-part-nodes.rules debian/kpartx.del-part-nodes.udev
+ cp kpartx/dm-parts.rules debian/kpartx.dm-parts.udev
+ cp kpartx/kpartx.rules debian/kpartx.udev
+ cp debian/tmp/lib/udev/rules.d/56-multipath.rules debian/multipath.udev
+ cp multipath/11-dm-mpath.rules debian/dm-mpath.udev
+
execute_after_dh_install:
if strings debian/multipath-udeb/lib/libmultipath.so.0 | grep
libsystemd.so ; then \
echo ERROR: udeb linked to libsystemd ;\
