From 49f9f9ad8b0a46d47fa1313ae9baa4b98dc257d9 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Thu, 28 Sep 2023 16:03:02 +0200
Subject: [PATCH] small fixes in beta

---
 CHANGELOG.md                         | 25 ++++++++++++++-----------
 debian12/Dockerfile                  |  1 -
 debian12/scripts/iobroker_startup.sh |  2 ++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1f331..12ea0c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,19 @@
 ## Changelog
 
-### v9.0.0-beta.1 (24.09.2023)
-* remove special settings script and env for zwave ([#377](https://github.com/buanet/ioBroker.docker/issues/377))
-* simplify ci/ reduce gh actions
-* ignore errors in "silent cleanup" on first start ([#369](https://github.com/buanet/ioBroker.docker/issues/369))
-* cleanup/ restructure repo
-* update nodejs setup process
-* update base image to debian 12 (bookworm)
-* improve security by avoiding root (exept startup script itself)
-* restrict iobroker commanline commands (start/ stop/ node fix)
-* integrate maintenance script into iobroker command
-* move container config files location
+### v9.0.0-beta.2 (coming soon)
+* fix issue with unlocking features in backitup ([#381](https://github.com/buanet/ioBroker.docker/issues/381))
+* fix issue with fresh initializing iobroker
+* v9.0.0-beta.1 (24.09.2023)
+  * remove special settings script and env for zwave ([#377](https://github.com/buanet/ioBroker.docker/issues/377))
+  * simplify ci/ reduce gh actions
+  * ignore errors in "silent cleanup" on first start ([#369](https://github.com/buanet/ioBroker.docker/issues/369))
+  * cleanup/ restructure repo
+  * update nodejs setup process
+  * update base image to debian 12 (bookworm)
+  * improve security by avoiding root (exept startup script itself)
+  * restrict iobroker commanline commands (start/ stop/ node fix)
+  * integrate maintenance script into iobroker command
+  * move container config files location
 
 ### v8.1.0 (15.08.2023)
 * repo cleanup
diff --git a/debian12/Dockerfile b/debian12/Dockerfile
index fb27fe1..4069a41 100644
--- a/debian12/Dockerfile
+++ b/debian12/Dockerfile
@@ -71,7 +71,6 @@ RUN apt-get update && apt-get upgrade -y \
     && usermod -u 1000 iobroker \
     && groupmod -g 1000 iobroker \
     && chown root:iobroker /usr/sbin/gosu \
-    #&& chmod +s /usr/sbin/gosu \
     # Set permissions and ownership
     && chown -R iobroker:iobroker /opt/scripts /opt/userscripts \
     && chmod 755 /opt/scripts/*.sh \
diff --git a/debian12/scripts/iobroker_startup.sh b/debian12/scripts/iobroker_startup.sh
index c8c9842..efe0957 100644
--- a/debian12/scripts/iobroker_startup.sh
+++ b/debian12/scripts/iobroker_startup.sh
@@ -306,6 +306,7 @@ fi
 # if restored a fresh install, running "iob setup first" for database init (but not on slaves!), otherwise check database connection
 if [[ -f /opt/iobroker/.fresh_install && "$multihost" != "slave" ]]; then
   echo -n "Initializing a fresh installation of ioBroker... "
+  if [[ ! -d "/opt/iobroker/log" ]]; then gosu iobroker mkdir "/opt/iobroker/log"; fi
   set +e
   bash iob setup first > /opt/iobroker/log/iob_setup_first.log 2>&1
   return=$?
@@ -446,6 +447,7 @@ fi
 if [[ "$backitup" == "true" ]]; then
   echo -n "IOB_BACKITUP_EXTDB is \"true\". Unlocking features..."
   echo "true" > /opt/.docker_config/.backitup
+  echo "true" > /opt/scripts/.docker_config/.backitup # old path, needed until changed in backitup
   echo "Done."
   echo " "
 fi