Merge ~mitchdz/ubuntu/+source/multipath-tools:mitch/manually_restart_service_socket into ubuntu/+source/multipath-tools:ubuntu/mantic-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/multipath-tools-manually-restart-service-socket

Unmerged commits

2a791b7... by Mitchell Dzurick on 2023-09-18

changelog

ff2e8c7... by Mitchell Dzurick on 2023-09-18

d/[rules|multipath-tools.posinst]: manually start/restart service/socket

Manually restart multipath-tools service/socket to force the order to be
Socket -> Service
As the socket should never be started after the service.
See (LP: #2034471)

diff --git a/debian/changelog b/debian/changelog
index 032e3d0..07c65aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+multipath-tools (0.9.4-5ubuntu4) mantic; urgency=medium
+
+  * Manually handle starting/restarting multipathd (LP: #2034471)
+    - d/rules: add --no-start to dh_installsystemd 
+    - d/multipath-tools.posinst: manually start/restart service/socket
+
+ -- Mitchell Dzurick <[e-mail]>  Mon, 18 Sep 2023 10:51:51 -0400
+
 multipath-tools (0.9.4-5ubuntu3) mantic; urgency=medium
 
   * d/initramfs/scripts/{local-bottom,local-top}/multipath: Make initramfs
diff --git a/debian/multipath-tools.postinst b/debian/multipath-tools.postinst
new file mode 100644
index 0000000..965656c
--- /dev/null
+++ b/debian/multipath-tools.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+# postinst script for multipath-tools
+#
+# see: dh_installdeb(1)
+
+set -e
+
+#DEBHELPER#
+
+# See (LP: #2034471)
+# Handles ordering the socket/service start/restart manually.
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
+	if [ -d /run/systemd/system ]; then
+		systemctl --system daemon-reload >/dev/null || true
+		deb-systemd-invoke stop multipathd.service multipathd.socket >/dev/null || true
+		deb-systemd-invoke start multipathd.socket multipathd.service >/dev/null || true
+	fi
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index b2f9922..5dd4f40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,10 @@ override_dh_installudev:
 override_dh_installsystemd:
 	dh_link -a lib/systemd/system/multipathd.service \
 		lib/systemd/system/multipath-tools.service
-	dh_installsystemd -pmultipath-tools multipathd.service
+	# Adding --no-start, but service/socket is started/restarted manually in
+	# multipath-tools.postinst to force the correct order of start/stop
+	# see (LP: #2034471)
+	dh_installsystemd -pmultipath-tools multipathd.service --no-start
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a --add-udeb=multipath-udeb