Merge ~mitchdz/ubuntu/+source/multipath-tools:mitch/manually_restart_multipathd_on_upgrade_to_systemd_only_package-lunar into ubuntu/+source/multipath-tools:ubuntu/jammy-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/multipath-tools-2035098

Unmerged commits

bbb6053... by Mitchell Dzurick on 2023-09-20

changelog

39377b4... by Mitchell Dzurick on 2023-09-20

debian/multipath-tools.postinst: restart when uprading to 0.8.8-1ubuntu2.2

When we removed the init scripts, invoke-rc.d handled stopping the multipathd
service in prerm, so we explicitly handle service/socket restarting on upgrade.

252a5bd... by Mitchell Dzurick on 2023-07-25

changelog

99af2f1... by Mitchell Dzurick on 2023-07-24

Do not install init scripts (LP: #2000186)

 - d/multipath-tools.maintscript: remove /etc/init.d/multipath-tools
 - d/rules: do not call dh_installinit

 This change is necessary mostly just to remove dh_installinit as
 there has been cases where dpkg fails to upgrade
 multipath-tools because dh_installinit calls invoke-rc.d which
 fails. We could fix this by adding --no-start to dh_installinit
 but might as well just remove the init scripts all together.

384860d... by Mitchell Dzurick on 2023-07-13

* d/p/0018-libmpathpersist-fix-command-keyword-ordering.patch:
    Fix mpathpersist command keyword ordering. (LP: #2026881)

51b0a77... by Marc Deslauriers on 2022-10-28

0.8.8-1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 2330fce..d99ede9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 multipath-tools (0.8.8-1ubuntu1.22.04.2) jammy; urgency=medium
 
   [ Sergio Durigan Junior ]
@@ -5,13 +6,30 @@ multipath-tools (0.8.8-1ubuntu1.22.04.2) jammy; urgency=medium
     Fix mpathpersist command keyword ordering. (LP: #2026881)
 
   [ Mitchell Dzurick ]
+=======
+multipath-tools (0.8.8-1ubuntu2.2) lunar; urgency=medium
+
+  * debian/multipath-tools.postinst: restart multipathd when upgrading to 
+    0.8.8-1ubuntu2.2 (LP: #2035098)
+
+ -- Mitchell Dzurick <[e-mail]>  Wed, 20 Sep 2023 05:18:54 -0700
+
+multipath-tools (0.8.8-1ubuntu2.1) lunar; urgency=medium
+
+  * d/p/0018-libmpathpersist-fix-command-keyword-ordering.patch:
+    Fix mpathpersist command keyword ordering. (LP: #2026881)
+>>>>>>> debian/changelog
   * Do not install init scripts (LP: #2000186)
     - d/multipath-tools.maintscript: remove /etc/init.d/multipath-tools
     - d/rules: do not call dh_installinit
 
  -- Mitchell Dzurick <[e-mail]>  Thu, 13 Jul 2023 11:50:32 -0700
 
+<<<<<<< debian/changelog
 multipath-tools (0.8.8-1ubuntu1.22.04.1) jammy-security; urgency=medium
+=======
+multipath-tools (0.8.8-1ubuntu2) lunar; urgency=medium
+>>>>>>> debian/changelog
 
   * SECURITY UPDATE: symlink attack
     - debian/patches/CVE-2022-41973.patch: use /run instead of /dev/shm in
diff --git a/debian/multipath-tools.maintscript b/debian/multipath-tools.maintscript
index c1b8897..4f532bd 100644
--- a/debian/multipath-tools.maintscript
+++ b/debian/multipath-tools.maintscript
@@ -1 +1,5 @@
+<<<<<<< debian/multipath-tools.maintscript
 rm_conffile /etc/init.d/multipath-tools 0.8.8-1ubuntu1.22.04.2~ multipath-tools
+=======
+rm_conffile /etc/init.d/multipath-tools 0.8.8-1ubuntu2.1~ multipath-tools
+>>>>>>> debian/multipath-tools.maintscript
diff --git a/debian/multipath-tools.postinst b/debian/multipath-tools.postinst
new file mode 100644
index 0000000..f376e9a
--- /dev/null
+++ b/debian/multipath-tools.postinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+# postinst script for multipath-tools
+#
+# see: dh_installdeb(1)
+
+set -e
+
+#DEBHELPER#
+
+FIXED=0.8.8-1ubuntu2.2
+# When we removed the initscripts, invoke-rc.d was used to stop the service
+# in the prerm. So this is just to handle the transition from the package that
+# has init scripts, to the one with just systemd scripts. Going forward, the 
+# service will restart on future upgrades fine.
+# https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/2035098
+if dpkg --compare-versions "$2" lt-nl "$FIXED"; 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
+
+exit 0