fix service dependencies

So that we can shutdown without triggering the watchdog. It is also
important to depend on syslog.service (else logs gets lost)

diff --git a/debian/pve-ha-crm.service b/debian/pve-ha-crm.service
index 34fb91ec274bbd97d75a3c923c3902e7a7900b13..ce285f5674e7c5fe643a82069e1a1469b22d1c45 100644 (file)
--- a/debian/pve-ha-crm.service
+++ b/debian/pve-ha-crm.service
@@ -3,9 +3,13 @@ Description=PVE Cluster Ressource Manager Daemon
 ConditionPathExists=/usr/sbin/pve-ha-crm
 ConditionPathExists=/etc/pve/ha/resources.cfg
 Requires=pve-cluster.service
+Requires=watchdog-mux.service
 Wants=pvedaemon.service
 After=pve-cluster.service
+After=corosync.service
 After=pvedaemon.service
+After=watchdog-mux.service
+After=syslog.service
 
 [Service]
 ExecStart=/usr/sbin/pve-ha-crm start

diff --git a/debian/pve-ha-lrm.service b/debian/pve-ha-lrm.service
index f946b192e803039278b2570f567fb7389d15cd7b..1f4f0571e297927071134d9fb26c810da3824256 100644 (file)
--- a/debian/pve-ha-lrm.service
+++ b/debian/pve-ha-lrm.service
@@ -3,15 +3,21 @@ Description=PVE Local HA Ressource Manager Daemon
 ConditionPathExists=/usr/sbin/pve-ha-lrm
 ConditionPathExists=/etc/pve/ha/resources.cfg
 Requires=pve-cluster.service
+Requires=watchdog-mux.service
 Wants=pvedaemon.service
+Wants=pve-ha-crm.service
+After=pve-ha-crm.service
 After=pve-cluster.service
+After=corosync.service
 After=pvedaemon.service
+After=watchdog-mux.service
+After=syslog.service
 
 [Service]
 ExecStart=/usr/sbin/pve-ha-lrm start
 ExecStop=/usr/sbin/pve-ha-lrm stop
 PIDFile=/var/run/pve-ha-lrm.pid
-TimeoutStopSec=60
+TimeoutStopSec=180
 Type=forking
 
 [Install]

diff --git a/debian/rules b/debian/rules
index 37a266a0d558c9409f7d9991b82989816f03a2c0..7233b72ed2c9c64d0ea60236fb70febd695527de 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,5 @@ override_dh_systemd_enable:
 
 override_dh_systemd_start:
        dh_systemd_start -ppve-ha-manager --name watchdog-mux --no-restart-on-upgrade watchdog-mux.service
-       dh_systemd_start -ppve-ha-manager --name pve-ha-crm pve-ha-crm.service pve-ha-lrm.service
+       dh_systemd_start -ppve-ha-manager --name pve-ha-lrm pve-ha-lrm.service
+       dh_systemd_start -ppve-ha-manager --name pve-ha-crm --restart-after-upgrade pve-ha-crm.service