Fix s6 service startup

This commit is contained in:
2026-04-04 01:46:57 +02:00
parent a3ebe392ed
commit d8696660f2
3 changed files with 5 additions and 34 deletions

View File

@@ -1,36 +1,10 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash # shellcheck shell=bash
# Make GPU devices accessible if present (running as root in HAOS)
FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null) FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
for i in $FILES for i in $FILES; do
do echo "**** found GPU device: ${i} ****"
VIDEO_GID=$(stat -c '%g' "${i}") chmod a+rw "${i}" 2>/dev/null || true
VIDEO_UID=$(stat -c '%u' "${i}")
# check if user matches device
if id -u abc | grep -qw "${VIDEO_UID}"; then
echo "**** permissions for ${i} are good ****"
else
# check if group matches and that device has group rw
if id -G abc | grep -qw "${VIDEO_GID}" && [ $(stat -c '%A' "${i}" | cut -b 5,6) = "rw" ]; then
echo "**** permissions for ${i} are good ****"
# check if device needs to be added to video group
elif ! id -G abc | grep -qw "${VIDEO_GID}"; then
# check if video group needs to be created
VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
if [ -z "${VIDEO_NAME}" ]; then
VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)"
groupadd "${VIDEO_NAME}"
groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}"
echo "**** creating video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
fi
echo "**** adding ${i} to video group ${VIDEO_NAME} with id ${VIDEO_GID} ****"
usermod -a -G "${VIDEO_NAME}" abc
fi
# check if device has group rw
if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then
echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****"
chmod g+rw "${i}"
fi
fi
done done

View File

@@ -41,6 +41,4 @@ fi
mkdir -p /config mkdir -p /config
cd /config || exit 1 cd /config || exit 1
exec \ exec /app/fah-client "${args[@]}" ${CLI_ARGS}
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7396" \
/app/fah-client "${args[@]}" ${CLI_ARGS}