From a63f4c7086ba9ab5763cf9fcbf2e3d02940447ea Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 3 Sep 2019 09:37:38 +0200
Subject: [PATCH] Cleanup some udev rules (#684)

* Cleanup some udev rules

* Helper

* Use new bashio command

* Update CHANGELOG.md

* Address comments
---
 deconz/CHANGELOG.md | 5 +++++
 deconz/Dockerfile   | 5 -----
 deconz/config.json  | 2 +-
 deconz/data/run.sh  | 5 ++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index fc8d0da..4e49dd7 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.4
+
+- Cleanup some udev rules
+- Use new Hass.io API for device reload
+
 ## 3.3
 
 - Fix relative to absolut device lookup
diff --git a/deconz/Dockerfile b/deconz/Dockerfile
index e42c251..870115f 100644
--- a/deconz/Dockerfile
+++ b/deconz/Dockerfile
@@ -31,11 +31,6 @@ 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/config.json b/deconz/config.json
index 1bc40fe..6876f07 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "3.3",
+  "version": "3.4",
   "slug": "deconz",
   "description": "Control a ZigBee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf"],
diff --git a/deconz/data/run.sh b/deconz/data/run.sh
index 0547800..6bbb180 100755
--- a/deconz/data/run.sh
+++ b/deconz/data/run.sh
@@ -3,7 +3,7 @@ set -e
 
 # Init own udev service
 /lib/systemd/systemd-udevd --daemon
-udevadm trigger
+bashio::hardware.trigger
 
 # Ensure otau folder exists
 mkdir -p "/data/otau"
@@ -24,8 +24,11 @@ VNC_PASSWORD=$(bashio::config 'vnc_password')
 WEBSOCKET_PORT=$(bashio::addon.port 8080)
 
 # Lookup udev link
+sleep 3
 if [ -L "${DECONZ_DEVICE}" ]; then
     DECONZ_DEVICE="$(readlink -f "${DECONZ_DEVICE}")"
+elif [ ! -e "${DECONZ_DEVICE}" ]; then
+    bashio::exit.nok "No device ${DECONZ_DEVICE} found!"
 fi
 
 # Load debug values