From 1839b350514042bb732dbbf96915e8c38e9f120d Mon Sep 17 00:00:00 2001 From: Matheson Steplock Date: Sun, 17 Dec 2023 23:52:04 -0500 Subject: [PATCH 1/3] Ensure Services are stopped and old container is destroyed --- homeassistant-supervised/DEBIAN/preinst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/homeassistant-supervised/DEBIAN/preinst b/homeassistant-supervised/DEBIAN/preinst index b229df3..fac3342 100755 --- a/homeassistant-supervised/DEBIAN/preinst +++ b/homeassistant-supervised/DEBIAN/preinst @@ -51,7 +51,30 @@ if [[ "$(sysctl --values kernel.dmesg_restrict)" != "0" ]]; then echo "kernel.dmesg_restrict=0" >> /etc/sysctl.conf fi +# If the hassio_supervisor service is running or exists, stop it +if [[ "$(systemctl is-active hassio-supervisor.service)" == "active" ]]; then + info "Stopping hassio_supervisor service" + systemctl stop hassio-supervisor.service +fi + +# If the hassio_apparmor service is running or exists, stop it +if [[ "$(systemctl is-active hassio-apparmor.service)" == "active" ]]; then + info "Stopping hassio_apparmor service" + systemctl stop hassio-apparmor.service +fi +# Check for existing hassio_supervisor container and destroy it +if [[ "$(docker ps -aq -f name=hassio_supervisor)" ]]; then + # ensure the hassio_supervisor service is stopped + info "Removing existing hassio_supervisor container" + docker container rm --force hassio_supervisor > /dev/null +fi + +# If docker is running, stop it +if [[ "$(systemctl is-active docker.service)" == "active" ]]; then + info "Stopping Docker service" + systemctl stop docker.service +fi dpkg-divert --package homeassistant-supervised --add --rename \ --divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf From 463d288dec2e503f33b3915311bdc7585f18b588 Mon Sep 17 00:00:00 2001 From: Matheson Steplock Date: Sun, 17 Dec 2023 23:57:07 -0500 Subject: [PATCH 2/3] systemd daemon reload --- homeassistant-supervised/DEBIAN/postinst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/homeassistant-supervised/DEBIAN/postinst b/homeassistant-supervised/DEBIAN/postinst index 3e5ee72..11f337d 100755 --- a/homeassistant-supervised/DEBIAN/postinst +++ b/homeassistant-supervised/DEBIAN/postinst @@ -19,6 +19,9 @@ URL_VERSION="https://version.home-assistant.io/stable.json" HASSIO_VERSION=$(curl -s ${URL_VERSION} | jq -e -r '.supervisor') URL_APPARMOR_PROFILE="https://version.home-assistant.io/apparmor.txt" +# reload systemd +info "Reload systemd" +systemctl daemon-reload # Restart NetworkManager info "Restarting NetworkManager" From eb9a17f692f991d0ff33f7baa2f355ca2f4a46a6 Mon Sep 17 00:00:00 2001 From: Matheson Steplock Date: Wed, 20 Dec 2023 16:07:03 -0500 Subject: [PATCH 3/3] No need to stop docker beforehand --- homeassistant-supervised/DEBIAN/preinst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/homeassistant-supervised/DEBIAN/preinst b/homeassistant-supervised/DEBIAN/preinst index fac3342..c36cf74 100755 --- a/homeassistant-supervised/DEBIAN/preinst +++ b/homeassistant-supervised/DEBIAN/preinst @@ -70,12 +70,6 @@ if [[ "$(docker ps -aq -f name=hassio_supervisor)" ]]; then docker container rm --force hassio_supervisor > /dev/null fi -# If docker is running, stop it -if [[ "$(systemctl is-active docker.service)" == "active" ]]; then - info "Stopping Docker service" - systemctl stop docker.service -fi - dpkg-divert --package homeassistant-supervised --add --rename \ --divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf