From d402b6adbb40507991112c03082fc32464db8e72 Mon Sep 17 00:00:00 2001 From: Michael Legleux Date: Thu, 9 Sep 2021 20:19:10 -0700 Subject: [PATCH] Don't restart rippled during apt upgrade: Resolves #3294 --- Builds/containers/packaging/dpkg/debian/rippled.postinst | 4 ++++ Builds/containers/packaging/dpkg/debian/rippled.postrm | 7 ++++++- Builds/containers/packaging/dpkg/debian/rules | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Builds/containers/packaging/dpkg/debian/rippled.postinst b/Builds/containers/packaging/dpkg/debian/rippled.postinst index 9838fa593f7..f5952190ff2 100644 --- a/Builds/containers/packaging/dpkg/debian/rippled.postinst +++ b/Builds/containers/packaging/dpkg/debian/rippled.postinst @@ -18,6 +18,10 @@ case "$1" in chmod 644 /opt/ripple/etc/update-rippled-cron chmod 644 /etc/logrotate.d/rippled chown -R root:$GROUP_NAME /opt/ripple/etc/update-rippled-cron + init_is_systemd=$(echo $(readlink $(ps -o command 1 | sed -n 2p))) + if ! [ $(expr "$init_is_systemd" : '.*systemd.*') -eq 0 ] > /dev/null 2>&1 && $(! ps -A -o command | grep "^/opt/ripple/bin/${rippled}" > /dev/null 2>&1) ; then + systemctl start rippled + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/Builds/containers/packaging/dpkg/debian/rippled.postrm b/Builds/containers/packaging/dpkg/debian/rippled.postrm index 9086993a1f5..df30ef71a54 100644 --- a/Builds/containers/packaging/dpkg/debian/rippled.postrm +++ b/Builds/containers/packaging/dpkg/debian/rippled.postrm @@ -2,9 +2,14 @@ set -e case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; + remove) + if ps -A -o command | grep "^/opt/ripple/bin/rippled" > /dev/null 2>&1 ; then + systemctl stop rippled + fi + ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 diff --git a/Builds/containers/packaging/dpkg/debian/rules b/Builds/containers/packaging/dpkg/debian/rules index 67443aae9fe..a49041e9733 100755 --- a/Builds/containers/packaging/dpkg/debian/rules +++ b/Builds/containers/packaging/dpkg/debian/rules @@ -10,7 +10,9 @@ export CXXFLAGS:=$(subst -Werror=format-security,,$(CXXFLAGS)) %: dh $@ --with systemd + override_dh_systemd_start: + dh_systemd_start --no-restart-on-upgrade override_dh_auto_configure: env