d/rules: add --no-restart-after-upgrade for dh compat >=10

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/patches/0016-d-rules-fix-no-restart-on-upgrade.patch b/patches/0016-d-rules-fix-no-restart-on-upgrade.patch
new file mode 100644 (file)
index 0000000..5904d02
--- /dev/null
+++ b/patches/0016-d-rules-fix-no-restart-on-upgrade.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 20 May 2021 15:36:34 +0200
+Subject: [PATCH] d/rules: also add --no-restart-after-upgrade parameter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+is only a problem with dh compat >= 10 as that enables the
+restart-after-upgrade by default.
+
+Keep the old --no-restart-on-upgrade one as else debian may just
+think we want the restart but as full stop in prerm and start only in
+postinst.
+
+For ceph we actually want to let the user fully control the restart
+explicit.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/rules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/debian/rules b/debian/rules
+index b5ce42c6f3..00e9ac6b16 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -92,7 +92,7 @@ override_dh_installinit:
+
+        # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
+        dh_systemd_enable
+-       dh_systemd_start --no-restart-on-upgrade
++       dh_systemd_start --no-restart-on-upgrade --no-restart-after-upgrade
+
+ override_dh_systemd_enable:
+        # systemd enable done as part of dh_installinit
+

diff --git a/patches/series b/patches/series
index f451b8d6c38f1b80ddba91ecde48e9ff43a932b8..82b6a8587789c0a3fa095e90a90fe394b4e3b69c 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -9,3 +9,4 @@
 0013-d-control-move-python-dependencies-over-to-python3.patch
 0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
 0015-d-control-drop-outdated-build-dependencies-and-bump-.patch
+0016-d-rules-fix-no-restart-on-upgrade.patch