From 4bcba322ff96aa5c59e6134115704d1bb9aee808 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 15 Jun 2020 14:48:58 +0200 Subject: [PATCH] Fix jitters during first update/boot (#742) * Fix jitters during first update/boot * Address comments * fix lint --- buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor index edbf94c75..d3e99a2ae 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor @@ -9,7 +9,7 @@ set -e . /etc/os-release # Init supervisor -SUPERVISOR_MIN_RUNTIME=30 +SUPERVISOR_MIN_RUNTIME=15 SUPERVISOR_IMAGE="homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor" SUPERVISOR_DATA=/mnt/data/supervisor SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}" || echo "") @@ -18,7 +18,7 @@ SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor # Check if previous runtime of the container meets the minimal runtime # If not, we might be in trouble. Image or container corruption, bad release? # Delete the container, delete the image, pull a fresh one -if [ -n "${SUPERVISOR_CONTAINER_ID}" ]; then +if [ -n "${SUPERVISOR_CONTAINER_ID}" ] && [ "${SUPERVISOR_IMAGE_ID}" = "${SUPERVISOR_CONTAINER_ID}" ]; then SUPERVISOR_START=$(docker inspect --format='{{.State.StartedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g") SUPERVISOR_STOP=$(docker inspect --format='{{.State.FinishedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g")