From febc4473d39f431c976a9af43a98495fce2ad6ba Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 9 Jan 2020 23:02:46 +0100
Subject: [PATCH] New supervisor / Adjust rauc handling (#530)

* OS: Update supervisor 194

* Remove old rauc mark code

* OS: Update supervisor 195

* Adjust dockerd
---
 .../configs/intel_nuc_defconfig               |  2 +-
 .../configs/odroid_c2_defconfig               |  2 +-
 .../configs/odroid_n2_defconfig               |  2 +-
 .../configs/odroid_xu4_defconfig              |  2 +-
 .../configs/opi_prime_defconfig               |  2 +-
 buildroot-external/configs/ova_defconfig      |  2 +-
 buildroot-external/configs/rpi0_w_defconfig   |  2 +-
 buildroot-external/configs/rpi2_defconfig     |  2 +-
 buildroot-external/configs/rpi3_64_defconfig  |  2 +-
 buildroot-external/configs/rpi3_defconfig     |  2 +-
 buildroot-external/configs/rpi4_64_defconfig  |  2 +-
 buildroot-external/configs/rpi4_defconfig     |  2 +-
 buildroot-external/configs/rpi_defconfig      |  2 +-
 buildroot-external/configs/tinker_defconfig   |  2 +-
 buildroot-external/misc/rauc-hook             |  9 ------
 .../system/docker.service.d/failure.conf      |  2 ++
 .../system/docker.service.d/resource.conf     |  2 ++
 .../timers.target.wants/rauc-mark.timer       |  1 -
 .../usr/lib/systemd/system/rauc-mark.service  |  9 ------
 .../usr/lib/systemd/system/rauc-mark.timer    |  8 ------
 .../rootfs-overlay/usr/libexec/hassos-rate    | 28 -------------------
 21 files changed, 18 insertions(+), 69 deletions(-)
 create mode 100644 buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/failure.conf
 create mode 100644 buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/resource.conf
 delete mode 120000 buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-mark.timer
 delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service
 delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.timer
 delete mode 100755 buildroot-external/rootfs-overlay/usr/libexec/hassos-rate

diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig
index 4ac498771..08a6f5abf 100644
--- a/buildroot-external/configs/intel_nuc_defconfig
+++ b/buildroot-external/configs/intel_nuc_defconfig
@@ -96,7 +96,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig
index 18798b274..1b5f15dc7 100644
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -90,7 +90,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig
index 725294857..5df300194 100644
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -90,7 +90,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-n2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig
index c045a8849..d2e577cdc 100644
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -95,7 +95,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig
index 4f2314336..105afc61b 100644
--- a/buildroot-external/configs/opi_prime_defconfig
+++ b/buildroot-external/configs/opi_prime_defconfig
@@ -104,7 +104,7 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_SWIG=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index a015ea654..46f264622 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -87,7 +87,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig
index 70f49e692..8389258ff 100644
--- a/buildroot-external/configs/rpi0_w_defconfig
+++ b/buildroot-external/configs/rpi0_w_defconfig
@@ -93,7 +93,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index a66ed963f..359ae3411 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
index 0791f7921..c8a127cf5 100644
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -93,7 +93,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig
index 8ee2183c8..9af044177 100644
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -93,7 +93,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig
index 970e229ac..76ac45bcf 100644
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -94,7 +94,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig
index bda719a64..8dd8cf01d 100644
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -94,7 +94,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig
index 1ee43953c..a131ecdd7 100644
--- a/buildroot-external/configs/rpi_defconfig
+++ b/buildroot-external/configs/rpi_defconfig
@@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig
index af663743f..dcfc07377 100644
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -97,7 +97,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="193"
+BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="195"
 BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
diff --git a/buildroot-external/misc/rauc-hook b/buildroot-external/misc/rauc-hook
index 851472e94..de24bf499 100755
--- a/buildroot-external/misc/rauc-hook
+++ b/buildroot-external/misc/rauc-hook
@@ -31,14 +31,5 @@ fi
 ##
 # Fixups
 
-# timesyncd
-if [ -L /var/lib/systemd/timesync ]; then
-    rm -f /var/lib/systemd/timesync
-fi
-
-# u-boot first stage device tree
-if [ -e /usr/sbin/fw_setenv ]; then
-    fw_setenv fdt_addr
-fi
 
 exit 0
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/failure.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/failure.conf
new file mode 100644
index 000000000..128fbd509
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/failure.conf
@@ -0,0 +1,2 @@
+[Unit]
+FailureAction=reboot
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/resource.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/resource.conf
new file mode 100644
index 000000000..0d7b1e5f9
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/resource.conf
@@ -0,0 +1,2 @@
+[Service]
+TasksMax=infinity
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-mark.timer b/buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-mark.timer
deleted file mode 120000
index bbdfaf738..000000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/timers.target.wants/rauc-mark.timer
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/rauc-mark.timer
\ No newline at end of file
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service
deleted file mode 100644
index 1c22ee576..000000000
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=HassOS rauc good 
-RefuseManualStart=true
-RefuseManualStop=true
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/hassos-rate
-RemainAfterExit=true
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.timer b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.timer
deleted file mode 100644
index fa79b78fd..000000000
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/rauc-mark.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=HassOS mark boot partition as good
-
-[Timer]
-OnBootSec=1min
-
-[Install]
-WantedBy=timers.target
diff --git a/buildroot-external/rootfs-overlay/usr/libexec/hassos-rate b/buildroot-external/rootfs-overlay/usr/libexec/hassos-rate
deleted file mode 100755
index 942e6d58d..000000000
--- a/buildroot-external/rootfs-overlay/usr/libexec/hassos-rate
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2112
-set -e
-
-
-function mark_good() {
-    rauc status mark-good
-    exit 0
-}
-
-function mark_bad() {
-    rauc status mark-bad
-    systemctl reboot
-}
-
-#### Check system ####
-
-# Docker state
-if systemctl -q is-failed docker; then
-    mark_bad
-fi
-
-# Docker state
-if systemctl -q is-failed hassos-supervisor; then
-    mark_bad
-fi
-
-mark_good