From e9891955be80261f0e7a60704bfeb882058be9da Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Thu, 25 Apr 2024 11:12:22 +0200
Subject: [PATCH] update

---
 zzz_draft_birdnet-pi/Dockerfile                     | 13 +++++++------
 .../disabled_service/svc-custom_recording/finish    |  2 +-
 .../etc/disabled_service/svc-custom_recording/run   |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish   |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-avahi-alias/run      |  2 +-
 .../s6-overlay/s6-rc.d/svc-birdnet_analysis/finish  |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run |  7 ++++---
 .../etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish   |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-birdnet_log/run      |  6 +++---
 .../s6-overlay/s6-rc.d/svc-birdnet_recording/finish |  2 +-
 .../s6-overlay/s6-rc.d/svc-birdnet_recording/run    |  6 +++---
 .../etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run    |  5 +++--
 .../rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish  |  2 +-
 .../rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run     |  6 +++---
 .../etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish  |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-chart_viewer/run     |  6 +++---
 .../rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish  |  2 +-
 .../rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run     |  8 +++-----
 .../etc/s6-overlay/s6-rc.d/svc-livestream/finish    |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-livestream/run       |  5 +++--
 .../s6-rc.d/svc-spectrogram_viewer/finish           |  2 +-
 .../s6-overlay/s6-rc.d/svc-spectrogram_viewer/run   |  6 +++---
 .../etc/s6-overlay/s6-rc.d/svc-web_terminal/finish  |  2 +-
 .../etc/s6-overlay/s6-rc.d/svc-web_terminal/run     |  5 +++--
 25 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile
index ead7a3d79..9be8673a0 100644
--- a/zzz_draft_birdnet-pi/Dockerfile
+++ b/zzz_draft_birdnet-pi/Dockerfile
@@ -24,7 +24,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     PUID=1000 \
     PGID=1000 \
     HOME="/home/abc" \
-    XDG_RUNTIME_DIR="/run/user/1000"
+    XDG_RUNTIME_DIR="/run/user/1000" \
+    PYTHON_VIRTUAL_ENV="/home/abc/BirdNET-Pi/birdnet/bin/python3"
 
 # hadolint ignore=DL3015,SC2016
 RUN \
@@ -56,14 +57,14 @@ RUN \
     \
     /./newinstaller.sh && \
     \
-    # Adapt for lsio
-    if [ -d /app ]; then rm -r /app; fi && \
-    ln -s /home/abc /app && \
-    chown -R abc:abc /home/abc /app && \
-    \
     # Change user to pi
     groupmod -o -g "100" abc && usermod -o -u "100" abc && \
     groupadd --gid 1000 pi && useradd --uid 1000 --gid 1000 -m pi
+    \
+    # Adapt for lsio
+    if [ -d /app ]; then rm -r /app; fi && \
+    ln -s /home/abc /app && \
+    chown -R pi:pi /home/abc /app
 
 #USER abc
 #WORKDIR /app
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/finish b/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/finish
index a05d78572..21d68ab7d 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-custom_recording
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/run b/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/run
index 44a66d0b2..f0ee17e1f 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/disabled_service/svc-custom_recording/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 s6-envdir /run/user/1000
 s6-setuidgid ${USER}
 /usr/local/bin/custom_recording.sh
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish
index 953684e24..8cc9f174a 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-avahi_alias
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/run
index 5f400a3ce..db31f0635 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-avahi-alias/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 s6-setuidgid ${USER}
 
 echo "Starting service: avahi alias"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
index 8f106e79e..3b4822906 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_analysis
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
index 9656d5890..f94745e94 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_analysis/run
@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet analysis"
-$PYTHON_VIRTUAL_ENV /usr/local/bin/birdnet_analysis.py
+
+exec \
+    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV /usr/local/bin/birdnet_analysis.py"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish
index 7de457cd3..403b846e3 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_log
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
index ff585824d..71db2064b 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_log/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet log"
-/usr/local/bin/gotty --address localhost -p 8080 --path log --title-format "BirdNET-Pi Log" birdnet_log.sh
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/gotty --address localhost -p 8080 --path log --title-format 'BirdNET-Pi Log' birdnet_log.sh"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
index 19fe8d9c6..fc166d388 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 6 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_recording
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
index 48afd0104..198251faa 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_recording/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: birdnet recording"
-/usr/local/bin/birdnet_recording.sh
\ No newline at end of file
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/birdnet_recording.sh"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
index 433a1072c..1e94b56f5 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 5 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-birdnet_stats
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run
index 609d48e94..9b8c877ee 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-birdnet_stats/run
@@ -1,4 +1,5 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 s6-setuidgid ${USER}
 echo "Starting service: birdnet stats"
-$HOME/BirdNET-Pi/birdnet/bin/streamlit run $HOME/BirdNET-Pi/scripts/plotly_streamlit.py --browser.gatherUsageStats false --server.address localhost --server.baseUrlPath "/stats"
+exec \
+    s6-setuidgid "$USER" "$HOME/BirdNET-Pi/birdnet/bin/streamlit run $HOME/BirdNET-Pi/scripts/plotly_streamlit.py --browser.gatherUsageStats false --server.address localhost --server.baseUrlPath '/stats'"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish
index 71ccdae07..8adf28b5d 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-caddy
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run
index 78c1930dc..e8d2444fa 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-caddy/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: caddy"
-/usr/local/bin/caddy run --config /etc/caddy/Caddyfile
\ No newline at end of file
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/caddy run --config /etc/caddy/Caddyfile"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish
index 09015de2e..f616f39ee 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 120 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-chart_viewer
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/run
index afa3ce1af..0e9a0310e 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-chart_viewer/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: chart viewer"
-$PYTHON_VIRTUAL_ENV /usr/local/bin/daily_plot.py --daemon --sleep 2
+exec \
+    s6-setuidgid "$USER" "$PYTHON_VIRTUAL_ENV /usr/local/bin/daily_plot.py --daemon --sleep 2"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish
index 1245eb5b2..e1ed061fe 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-getty
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run
index f5d6c1909..1ebeecb91 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-getty/run
@@ -1,6 +1,4 @@
-#!/usr/bin/with-contenv bash
-
-with-contenv
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: getty"
-/sbin/agetty --autologin ${USER} --noclear %I $TERM
\ No newline at end of file
+exec \
+    s6-setuidgid "$USER" "/sbin/agetty --autologin ${USER} --noclear %I $TERM"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/finish
index bfdeb2562..9e7d0f1b4 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-livestream
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
index 23aa8de46..931cf054b 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-livestream/run
@@ -1,3 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 echo "Starting service: livestream"
-/usr/local/bin/livestream.sh
\ No newline at end of file
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/livestream.sh"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
index 173f611a3..1ee0d4542 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 10 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer
\ No newline at end of file
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
index e9337c336..bc7951ee6 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-spectrogram_viewer/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
-s6-setuidgid ${USER}
+#!/usr/bin/with-contenv bashio
 echo "Starting service: spectrogram viewer"
-/usr/local/bin/spectrogram.sh
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/spectrogram.sh"
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/finish b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/finish
index 5622f8cc8..fe91824a9 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/finish
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/finish
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 
 if { sleep 3 }
 s6-svc -u /etc/s6-overlay/s6-rc.d/svc-web_terminal
diff --git a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
index ca64fe77a..495499d65 100644
--- a/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
+++ b/zzz_draft_birdnet-pi/rootfs/etc/s6-overlay/s6-rc.d/svc-web_terminal/run
@@ -1,3 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 echo "Starting service: web terminal"
-/usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format "BirdNET-Pi Terminal" login
+exec \
+    s6-setuidgid "$USER" "/usr/local/bin/gotty --address localhost -w -p 8888 --path terminal --title-format 'BirdNET-Pi Terminal' login"