remove workarounds for avoiding HA fencing on upgrade

those got introduced by commit
ec826d72c06e6f649b2b19c3341c39abb29b19f9 and can now be safely
removed, as current pve-cluster and pve-ha-manager do show this
problems, and upgrades need to go through latest PVE 5.X which then
ensures this is fixed.

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

diff --git a/debian/pve-cluster.postinst b/debian/pve-cluster.postinst
deleted file mode 100644 (file)
index 47292ca..0000000
--- a/debian/pve-cluster.postinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# abort if any command returns an error value
-set -e
-
-# handle problem with ha-manager <= 2.0-3 which cannot handle a pmxcfs
-# restart correctly
-# TODO: remove in PVE 6.0
-ha_version=$(dpkg-query --showformat='${Version}' --show pve-ha-manager)
-hacfg_version=$(dpkg-query --showformat='${Config-Version}' --show pve-ha-manager)
-
-function handlehaservice {
-  if test -z "$1"; then
-    # no old version, nothing to do
-    true
-  else
-    if dpkg --compare-versions "$ha_version" '<=' '2.0-3' || dpkg --compare-versions "$hacfg_version" '<=' '2.0-3'; then
-      if systemctl --quiet "$2" "pve-ha-lrm.service"; then
-        systemctl "$3" "pve-ha-lrm.service"
-      fi
-      if systemctl --quiet "$2" "pve-ha-crm.service"; then
-        systemctl "$3" "pve-ha-crm.service"
-      fi
-    fi
-  fi
-}
-
-
-case "$1" in
-  configure)
-    handlehaservice "$2" 'is-active' 'stop'
-    ;;
-
-esac
-
-#DEBHELPER#
-
-case "$1" in
-  configure)
-    handlehaservice "$2" 'is-enabled' 'start'
-    ;;
-
-esac

diff --git a/debian/pve-cluster.preinst b/debian/pve-cluster.preinst
deleted file mode 100644 (file)
index bcba9cc..0000000
--- a/debian/pve-cluster.preinst
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# abort if any command returns an error value
-set -e
-
-# handle incorrectly installed sysctl.d snippet (pve-cluster 5.0-16 and -17)
-# TODO: remove in PVE 6.0
-function sysctlcleanup {
-  if test -z "$1"; then
-    # no old version, nothing to do
-    true
-  else
-    if dpkg --compare-versions "$1" '<=' '5.0-17'; then
-      # remove directory if it exists
-      # otherwise we can't install our actual pve.conf file
-      if test -d '/etc/sysctl.d/pve.conf'; then
-        rm -rf '/etc/sysctl.d/pve.conf'
-      fi
-    fi
-  fi
-}
-
-case "$1" in
-  upgrade)
-    sysctlcleanup "$2"
-    ;;
-
-  install)
-    sysctlcleanup "$2"
-    ;;
-
-esac
-
-#DEBHELPER#