From 7e26e65a9beeda92f11c951610eb8a8fd1625b73 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 2 Feb 2021 12:18:49 +0100
Subject: [PATCH] Fix deconz error spam with supervisor beta (#1798)

---
 .devcontainer/supervisor.sh           | 27 +++++++++++++++++++++++----
 deconz/CHANGELOG.md                   |  4 ++++
 deconz/config.json                    |  2 +-
 deconz/rootfs/etc/services.d/udev/run |  4 ++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/supervisor.sh b/.devcontainer/supervisor.sh
index ead5615..7c2ffe5 100755
--- a/.devcontainer/supervisor.sh
+++ b/.devcontainer/supervisor.sh
@@ -78,10 +78,11 @@ function run_supervisor() {
         --name hassio_supervisor \
         --security-opt seccomp=unconfined \
         --security-opt apparmor:unconfined \
-        -v /run/docker.sock:/run/docker.sock \
-        -v /run/dbus:/run/dbus \
-        -v /tmp/supervisor_data:/data \
-        -v "/workspaces/addons":/data/addons/local \
+        -v /run/docker.sock:/run/docker.sock:rw \
+        -v /run/dbus:/run/dbus:ro \
+        -v /run/udev:/run/udev:ro \
+        -v /tmp/supervisor_data:/data:rw \
+        -v "/workspaces/addons":/data/addons/local:rw \
         -v /etc/machine-id:/etc/machine-id:ro \
         -e SUPERVISOR_SHARE="/tmp/supervisor_data" \
         -e SUPERVISOR_NAME=hassio_supervisor \
@@ -108,6 +109,23 @@ function init_dbus() {
     dbus-daemon --system --print-address
 }
 
+function init_udev() {
+    if pgrep systemd-udevd; then
+        echo "udev is running"
+        return 0
+    fi
+
+    echo "Startup udev"
+
+    # cleanups
+    mkdir -p /run/udev
+
+    # run
+    /lib/systemd/systemd-udevd --daemon
+    sleep 3
+    udevadm trigger && udevadm settle
+}
+
 echo "Start Test-Env"
 
 start_docker
@@ -118,5 +136,6 @@ docker system prune -f
 cleanup_lastboot
 cleanup_docker
 init_dbus
+init_udev
 run_supervisor
 stop_docker
diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index bad1812..423e649 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.6.4
+
+- Fix errors with new Supervisor as transit update
+
 ## 6.6.3
 
 - Use hostname for discovery instead of IP
diff --git a/deconz/config.json b/deconz/config.json
index a9dda88..2379d30 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "6.6.3",
+  "version": "6.6.4",
   "slug": "deconz",
   "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf", "aarch64"],
diff --git a/deconz/rootfs/etc/services.d/udev/run b/deconz/rootfs/etc/services.d/udev/run
index fe1ea3c..545ea66 100644
--- a/deconz/rootfs/etc/services.d/udev/run
+++ b/deconz/rootfs/etc/services.d/udev/run
@@ -3,6 +3,10 @@
 # Start udevd service
 # ==============================================================================
 
+if bashio::fs.directory_exists /run/udev; then
+    exec sleep infinity
+fi
+
 # Triggers udev reload in the background
 ./trigger &