From b5c6861484e5f4cc1bc109fe244ab286adc00cd8 Mon Sep 17 00:00:00 2001
From: Valentin Ochs <a@0au.de>
Date: Mon, 16 Aug 2021 22:52:59 +0200
Subject: [PATCH] update stuff

---
 br_external/package/door_pi_control/door_pi_control.mk | 2 +-
 config                                                 | 8 ++++----
 root_overlay/bin/door.py                               | 3 +++
 root_overlay/bin/watcher                               | 2 +-
 root_overlay/etc/init.d/S99nfc.sh                      | 3 +--
 5 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100755 root_overlay/bin/door.py

diff --git a/br_external/package/door_pi_control/door_pi_control.mk b/br_external/package/door_pi_control/door_pi_control.mk
index ada75b9..33aeb45 100644
--- a/br_external/package/door_pi_control/door_pi_control.mk
+++ b/br_external/package/door_pi_control/door_pi_control.mk
@@ -1,4 +1,4 @@
-DOOR_PI_CONTROL_VERSION = 69c823ec524066572541fb91e4dcfb90b4ca1d05
+DOOR_PI_CONTROL_VERSION = 432430e78dd2306817b59d7136144bbd20e2c8bf
 DOOR_PI_CONTROL_SOURCE = $(DOOR_PI_CONTROL_VERSION).tar.gz
 DOOR_PI_CONTROL_SITE = https://git.imaginaerraum.de/apo/DoorControl/archive
 DOOR_PI_CONTROL_LICENSE = GPL-3.0
diff --git a/config b/config
index 3401d51..da232b1 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.02-177-g2b3ceddd87 Configuration
+# Buildroot 2021.02-178-g600e879108 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_EXTERNAL_DOOR_PI_PATH="/home/apo/Projects/Hackerspace/DoorPi/br_external"
@@ -1440,9 +1440,9 @@ BR2_PACKAGE_PYTHON3_PYC_ONLY=y
 # BR2_PACKAGE_PYTHON3_SSL is not set
 BR2_PACKAGE_PYTHON3_UNICODEDATA=y
 BR2_PACKAGE_PYTHON3_SQLITE=y
-# BR2_PACKAGE_PYTHON3_PYEXPAT is not set
+BR2_PACKAGE_PYTHON3_PYEXPAT=y
 # BR2_PACKAGE_PYTHON3_XZ is not set
-# BR2_PACKAGE_PYTHON3_ZLIB is not set
+BR2_PACKAGE_PYTHON3_ZLIB=y
 
 #
 # External python modules
@@ -2495,7 +2495,7 @@ BR2_PACKAGE_SPIDERMONKEY_JIT_ARCH_SUPPORTS=y
 # benejson needs a toolchain w/ C++
 #
 # BR2_PACKAGE_CJSON is not set
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_JANSSON is not set
 # BR2_PACKAGE_JOSE is not set
 # BR2_PACKAGE_JSMN is not set
diff --git a/root_overlay/bin/door.py b/root_overlay/bin/door.py
new file mode 100755
index 0000000..d5a6fca
--- /dev/null
+++ b/root_overlay/bin/door.py
@@ -0,0 +1,3 @@
+#!/usr/bin/python3
+from door_pi_control import main
+main()
diff --git a/root_overlay/bin/watcher b/root_overlay/bin/watcher
index 26e70df..d0631e3 100755
--- a/root_overlay/bin/watcher
+++ b/root_overlay/bin/watcher
@@ -3,5 +3,5 @@ while true; do
 	start-stop-daemon -S -m -p /tmp/poll_desfire.pid -x /bin/poll_desfire -b -- /root/key /tmp/nfc_fifo
 	start-stop-daemon -v -p /tmp/fcpy.pid -S -b -m -v -x /usr/bin/python -- /bin/door.py
 	start-stop-daemon -v -p /tmp/webiface.pid -S -b -m -v -x /usr/bin/python -- /usr/bin/launch_webadmin
-	sleep 30
+	sleep 5
 done
diff --git a/root_overlay/etc/init.d/S99nfc.sh b/root_overlay/etc/init.d/S99nfc.sh
index 8d892c3..3cbb768 100755
--- a/root_overlay/etc/init.d/S99nfc.sh
+++ b/root_overlay/etc/init.d/S99nfc.sh
@@ -1,4 +1,3 @@
 rm /tmp/nfc_fifo
 mkfifo /tmp/nfc_fifo
-start-stop-daemon -S -m -p /tmp/watcher.pid      -x /bin/watcher -b
-
+start-stop-daemon -v -p /tmp/watcher.pid -S -b -m -v -x /bin/sh -- /bin/watcher