From f2970e23eaf60be2eddd18df89dd3a4a851b3788 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 30 Aug 2019 11:59:28 +0200
Subject: [PATCH] deCONZ 2.05.67 / new udev functions (#671)

* deCONZ 2.05.67 / new udev functions

* bump version

* Update CHANGELOG.md

* Fix load issues

* Cleanup

* lookup simlink

* Fix lint

* fix comments
---
 deconz/CHANGELOG.md |  6 ++++++
 deconz/Dockerfile   |  6 ++++++
 deconz/build.json   |  2 +-
 deconz/config.json  |  3 ++-
 deconz/data/run.sh  | 11 +++++++++--
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index fe1f02e..f1422eb 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2
+
+- Bump deCONZ to 2.05.67
+- Add own udev service
+- Monitoring only deCONZ process
+
 ## 3.1
 
 - Improves VNC desktop name
diff --git a/deconz/Dockerfile b/deconz/Dockerfile
index 0779239..e42c251 100644
--- a/deconz/Dockerfile
+++ b/deconz/Dockerfile
@@ -9,6 +9,7 @@ ARG BUILD_ARCH
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         curl \
+        udev \
         iproute2 \
         iputils-ping \
         kmod \
@@ -30,6 +31,11 @@ RUN apt-get update \
         xfonts-base \
         xfonts-scalable \
     && rm -rf /var/lib/apt/lists/* \
+    \
+    && curl -L https://github.com/gentoo/eudev/archive/master.tar.gz | tar -xz \
+    && cp eudev-master/rules/* /etc/udev/rules.d/ \
+    && rm -rf eudev-master \
+    \
     && if [ "${BUILD_ARCH}" = "armhf" ]; \
         then \
             curl -q -L -o /wiringpi.deb https://unicorn.drogon.net/wiringpi-2.46-1.deb \
diff --git a/deconz/build.json b/deconz/build.json
index b568f43..7354426 100644
--- a/deconz/build.json
+++ b/deconz/build.json
@@ -4,6 +4,6 @@
     "armhf": "homeassistant/armhf-base-raspbian:stretch"
   },
   "args": {
-    "DECONZ_VERSION": "2.05.66"
+    "DECONZ_VERSION": "2.05.67"
   }
 }
diff --git a/deconz/config.json b/deconz/config.json
index 547d05b..e472858 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "3.1",
+  "version": "3.2",
   "slug": "deconz",
   "description": "Control a ZigBee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf"],
@@ -23,6 +23,7 @@
   "host_network": true,
   "kernel_modules": true,
   "auto_uart": true,
+  "udev": true,
   "gpio": true,
   "apparmor": false,
   "privileged": [
diff --git a/deconz/data/run.sh b/deconz/data/run.sh
index 1128a9a..a07e703 100755
--- a/deconz/data/run.sh
+++ b/deconz/data/run.sh
@@ -1,6 +1,10 @@
 #!/usr/bin/env bashio
 set -e
 
+# Init own udev service
+/lib/systemd/systemd-udevd --daemon
+udevadm trigger
+
 # Ensure otau folder exists
 mkdir -p "/data/otau"
 
@@ -19,6 +23,11 @@ VNC_PORT=$(bashio::addon.port 5900)
 VNC_PASSWORD=$(bashio::config 'vnc_password')
 WEBSOCKET_PORT=$(bashio::addon.port 8080)
 
+# Lookup udev link
+if [ -L "${DECONZ_DEVICE}" ]; then
+    DECONZ_DEVICE="$(readlink "${DECONZ_DEVICE}")"
+fi
+
 # Load debug values
 bashio::config.has_value 'dbg_info' \
     && DBG_INFO="$(bashio::config 'dbg_info')" || DBG_INFO=1
@@ -91,12 +100,10 @@ WAIT_PIDS+=($!)
 # Start OTA updates for deCONZ
 bashio::log.info "Running the deCONZ OTA updater..."
 deCONZ-otau-dl.sh &> /dev/null &
-WAIT_PIDS+=($!)
 
 # Start OTA updates for IKEA
 bashio::log.info "Running the IKEA OTA updater..."
 ika-otau-dl.sh &> /dev/null &
-WAIT_PIDS+=($!)
 
 # Register stop
 function stop_addon() {