diff --git a/root/etc/s6-overlay/s6-rc.d/init-foldingathome-video/run b/root/etc/s6-overlay/s6-rc.d/init-foldingathome-video/run index 436acf6..8bbb07f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-foldingathome-video/run +++ b/root/etc/s6-overlay/s6-rc.d/init-foldingathome-video/run @@ -1,36 +1,10 @@ #!/usr/bin/with-contenv 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) -for i in $FILES -do - VIDEO_GID=$(stat -c '%g' "${i}") - 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 +for i in $FILES; do + echo "**** found GPU device: ${i} ****" + chmod a+rw "${i}" 2>/dev/null || true done diff --git a/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/notification-fd deleted file mode 100644 index e440e5c..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/run b/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/run index 4919eec..0bcfa3a 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-foldingathome/run @@ -41,6 +41,4 @@ fi mkdir -p /config cd /config || exit 1 -exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7396" \ - /app/fah-client "${args[@]}" ${CLI_ARGS} +exec /app/fah-client "${args[@]}" ${CLI_ARGS}