Move oxen-node restart logic into lokid.postinst

If it's in oxend.postinst then the config file migration will not have
occured.
This commit is contained in:
Jason Rhinelander 2021-01-13 17:50:59 -04:00
parent 8e389932f1
commit bbfaabc671
2 changed files with 19 additions and 11 deletions

19
debian/lokid.postinst vendored Normal file
View File

@ -0,0 +1,19 @@
#!/bin/sh
set -e
#DEBHELPER#
if [ "$1" = configure ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt "8.1.5-1~"; then
# The first time we upgrade to the 8.1.5 transitional package we have to take care of some
# migrations:
# - moving the config file (this will already happen in the DEBHELPER sections above)
# - restarting the oxen-node service. This *won't* happen in oxend's postinst because the new
# service has an alias to the old name, and because oxend will be a new package install it will
# only try to `start` rather than `restart` the service.
echo "LOKI -> OXEN migration detected; restarting oxend"
for s in node testnet-node; do
deb-systemd-invoke restart oxen-$s.service || true
done
fi

11
debian/oxend.postinst vendored
View File

@ -37,11 +37,9 @@ if [ "$1" = configure ]; then
# oxen-node enabled status so that the new oxen-node.service file ends up in the right state
# (i.e. not enabled if loki-node.service wasn't enabled).
if [ -z "$2" ] && [ -f /var/lib/dpkg/info/lokid.list ]; then
lokid_restart=""
for s in node.service testnet-node.service; do
if deb-systemd-helper --quiet was-enabled "loki-$s"; then
deb-systemd-helper enable "oxen-$s"
lokid_restart="$lokid_restart oxen-$s"
else
deb-systemd-helper disable "oxen-$s"
fi
@ -50,12 +48,3 @@ if [ "$1" = configure ]; then
fi
#DEBHELPER#
if [ -n "$lokid_restart" ]; then
# The dh_installsystemd script above only tries a restart on upgrades, but since we are doing
# the loki -> oxen rename on the service, it isn't an upgrade on a new oxend package
# installation and so it only tries a start, rather than restart, but this is a no-op when the
# (old) loki-node.service is already running, so force the restart here on such an upgrade.
echo "LOKI -> OXEN migration detected; restarting $lokid_restart"
deb-systemd-invoke restart $lokid_restart >/dev/null || true
fi