use setup_hwaccel for robust hardware acceleration (#10054)

* fix(jellyfin): use setup_hwaccel for robust hardware acceleration Replaces manual hardware acceleration setup with the centralized setup_hwaccel function from tools.func. This fixes the installation failure in privileged containers where /dev/dri does not exist (e.g., when no GPU is passed through). The setup_hwaccel function includes: - Proper error handling for missing /dev/dri - GPU vendor detection (Intel, AMD, NVIDIA) - Graceful fallback when no GPU is available Fixes: Installation fails with 'chgrp: cannot access /dev/dri' when creating privileged containers without GPU passthrough. * refactor(hwaccel): standardize hardware acceleration across all install scripts Migrated all install scripts to use the centralized setup_hwaccel function: - plex-install.sh - emby-install.sh - ersatztv-install.sh - frigate-install.sh - tdarr-install.sh - unmanic-install.sh - channels-install.sh - ollama-install.sh - immich-install.sh (added error handling) Enhanced setup_hwaccel function in tools.func: - Added -d /dev/dri check before setting permissions - Added error handling (2>/dev/null || true) for all /dev/dri operations - Added adduser error handling for video/render groups - No longer fails if no GPU is detected (graceful skip) - Added intel-media-va-driver for newer Intel GPUs - Improved AMD APU support with firmware packages - Better NVIDIA handling (warning instead of failure) This fixes installation failures in privileged containers without GPU passthrough, where /dev/dri does not exist. Supports: Ubuntu, Debian 12 (Bookworm), Debian 13 (Trixie) GPU Support: Intel, AMD, NVIDIA (manual driver) * refactor(hwaccel): complete migration for all GPU apps Migrated remaining GPU apps to setup_hwaccel: - fileflows-install.sh - openwebui-install.sh (added setup_hwaccel - was missing) - tunarr-install.sh Also fixed tools/pve/hw-acceleration.sh: - Added error handling for /dev/dri operations - Added chmod 660 /dev/dri/* that was missing - Added error suppression for adduser commands All 13 GPU apps (var_gpu=yes) now use centralized setup_hwaccel: jellyfin, plex, emby, ersatztv, frigate, tdarr, unmanic, channels, ollama, immich, fileflows, openwebui, tunarr * feat(hwaccel): complete Intel non-free driver support and GID sync Enhanced setup_hwaccel function: - Auto-detect Intel GPU generation (Gen 9+ for non-free drivers) - Debian 12 (Bookworm): Add non-free repo + intel-media-va-driver-non-free - Debian 13 (Trixie): Add non-free repo + libvpl2 + mesa-opencl-icd - Ubuntu: Use ubuntu repos with intel-media-va-driver - Fallback to open drivers if non-free fails - GID sync for video/render groups (moved from install scripts) OpenWebUI: Added Intel oneAPI support when installing Ollama - Intel Level Zero GPU support - Intel oneAPI Base Toolkit - Same setup as standalone Ollama install Cleanup: - Removed duplicate GID sync from tdarr-install.sh - Removed duplicate GID sync from unmanic-install.sh * fix(ersatztv): remove duplicate HW acceleration code Removed manual Intel HW acceleration setup that remained after setup_hwaccel migration. The non-free driver prompt is no longer needed as setup_hwaccel auto-detects Intel GPU generation.
2025-12-24 16:06:24 +01:00 · 2025-12-17 14:37:31 +01:00
parent 8e3da31471
commit 3a9d03fdb7
14 changed files with 213 additions and 280 deletions
--- a/install/channels-install.sh
+++ b/install/channels-install.sh
@ -29,19 +29,7 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
  exit 10
 fi

-if [[ "$CTTYPE" == "0" ]]; then
-  msg_info "Setting Up Hardware Acceleration"
-  $STD apt-get -y install \
-    va-driver-all \
-    ocl-icd-libopencl1 \
-    intel-opencl-icd
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-  msg_ok "Set Up Hardware Acceleration"
-fi
+setup_hwaccel

 msg_info "Installing Channels DVR Server (Patience)"
 cd /opt
--- a/install/emby-install.sh
+++ b/install/emby-install.sh
@ -13,16 +13,7 @@ setting_up_container
 network_check
 update_os

-msg_info "Setting Up Hardware Acceleration"
-$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 fetch_and_deploy_gh_release "emby" "MediaBrowser/Emby.Releases" "binary"

--- a/install/ersatztv-install.sh
+++ b/install/ersatztv-install.sh
@ -13,38 +13,7 @@ setting_up_container
 network_check
 update_os

-msg_info "Setting Up Hardware Acceleration"
-$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-fi
-msg_ok "Set Up Hardware Acceleration"
-
-read -r -p "${TAB3}Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 12 only)? <y/N> " prompt
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Intel Hardware Acceleration (non-free)"
-  cat <<EOF >/etc/apt/sources.list.d/non-free.list
-
-deb http://deb.debian.org/debian bookworm non-free non-free-firmware
-deb-src http://deb.debian.org/debian bookworm non-free non-free-firmware
-
-deb http://deb.debian.org/debian-security bookworm-security non-free non-free-firmware
-deb-src http://deb.debian.org/debian-security bookworm-security non-free non-free-firmware
-
-deb http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
-deb-src http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
-EOF
-  $STD apt-get update
-  $STD apt-get -y install {intel-media-va-driver-non-free,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-else
-  msg_info "Installing Intel Hardware Acceleration"
-  $STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-fi
-msg_ok "Installed and Set Up Intel Hardware Acceleration"
+setup_hwaccel

 fetch_and_deploy_gh_release "ersatztv" "ErsatzTV/ErsatzTV" "prebuild" "latest" "/opt/ErsatzTV" "*linux-x64.tar.gz"
 fetch_and_deploy_gh_release "ersatztv-ffmpeg" "ErsatzTV/ErsatzTV-ffmpeg" "prebuild" "latest" "/opt/ErsatzTV-ffmpeg" "*-linux64-gpl-7.1.tar.xz"
--- a/install/fileflows-install.sh
+++ b/install/fileflows-install.sh
@ -21,27 +21,7 @@ $STD apt-get install -y \
  imagemagick
 msg_ok "Installed Dependencies"

-read -r -p "${TAB3}Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 12 only)? <y/N> " prompt
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Intel Hardware Acceleration (non-free)"
-  cat <<EOF >/etc/apt/sources.list.d/non-free.list
-
-deb http://deb.debian.org/debian bookworm non-free non-free-firmware
-deb-src http://deb.debian.org/debian bookworm non-free non-free-firmware
-
-deb http://deb.debian.org/debian-security bookworm-security non-free non-free-firmware
-deb-src http://deb.debian.org/debian-security bookworm-security non-free non-free-firmware
-
-deb http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
-deb-src http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
-EOF
-  $STD apt-get update
-  $STD apt-get -y install {intel-media-va-driver-non-free,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-else
-  msg_info "Installing Intel Hardware Acceleration"
-  $STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-fi
-msg_ok "Installed and Set Up Intel Hardware Acceleration"
+setup_hwaccel

 msg_info "Installing ASP.NET Core Runtime"
 curl -fsSL https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -o packages-microsoft-prod.deb
--- a/install/frigate-install.sh
+++ b/install/frigate-install.sh
@ -33,14 +33,7 @@ chmod +x go2rtc
 $STD ln -svf /usr/local/go2rtc/bin/go2rtc /usr/local/bin/go2rtc
 msg_ok "Installed go2rtc"

-msg_info "Setting Up Hardware Acceleration"
-$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 msg_info "Installing Frigate v0.14.1 (Perseverance)"
 cd ~
--- a/install/immich-install.sh
+++ b/install/immich-install.sh
@ -75,12 +75,13 @@ $STD apt install -y jellyfin-ffmpeg7
 ln -sf /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg
 ln -sf /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe

+# Set permissions for /dev/dri (only in privileged containers and if /dev/dri exists)
 if [[ "$CTTYPE" == "0" && -d /dev/dri ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser "$(id -u -n)" video
-  $STD adduser "$(id -u -n)" render
+  chgrp video /dev/dri 2>/dev/null || true
+  chmod 755 /dev/dri 2>/dev/null || true
+  chmod 660 /dev/dri/* 2>/dev/null || true
+  $STD adduser "$(id -u -n)" video 2>/dev/null || true
+  $STD adduser "$(id -u -n)" render 2>/dev/null || true
 fi
 msg_ok "Dependencies Installed"

--- a/install/jellyfin-install.sh
+++ b/install/jellyfin-install.sh
@ -13,25 +13,7 @@ setting_up_container
 network_check
 update_os

-msg_info "Setting Up Hardware Acceleration"
-if ! grep -qEi 'ubuntu' /etc/os-release; then
-  fetch_and_deploy_gh_release "intel-igc-core-2" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-core-2_*_amd64.deb"
-  fetch_and_deploy_gh_release "intel-igc-opencl-2" "intel/intel-graphics-compiler" "binary" "latest" "" "intel-igc-opencl-2_*_amd64.deb"
-  fetch_and_deploy_gh_release "intel-libgdgmm12" "intel/compute-runtime" "binary" "latest" "" "libigdgmm12_*_amd64.deb"
-  fetch_and_deploy_gh_release "intel-opencl-icd" "intel/compute-runtime" "binary" "latest" "" "intel-opencl-icd_*_amd64.deb"
-else
-  $STD apt -y install intel-opencl-icd
-fi
-
-$STD apt -y install {va-driver-all,ocl-icd-libopencl1,vainfo,intel-gpu-tools}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 msg_info "Installing Jellyfin"
 VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
--- a/install/ollama-install.sh
+++ b/install/ollama-install.sh
@ -41,16 +41,11 @@ EOF
 $STD apt update
 msg_ok "Set up Intel® Repositories"

-msg_info "Setting Up Hardware Acceleration"
-$STD apt -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools,intel-level-zero-gpu,level-zero,level-zero-dev}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel
+
+msg_info "Installing Intel® Level Zero"
+$STD apt -y install intel-level-zero-gpu level-zero level-zero-dev 2>/dev/null || true
+msg_ok "Installed Intel® Level Zero"

 msg_info "Installing Intel® oneAPI Base Toolkit (Patience)"
 $STD apt install -y --no-install-recommends intel-basekit-2024.1
--- a/install/openwebui-install.sh
+++ b/install/openwebui-install.sh
@ -17,6 +17,8 @@ msg_info "Installing Dependencies"
 $STD apt install -y ffmpeg
 msg_ok "Installed Dependencies"

+setup_hwaccel
+
 PYTHON_VERSION="3.12" setup_uv

 msg_info "Installing Open WebUI"
@ -25,6 +27,36 @@ msg_ok "Installed Open WebUI"

 read -r -p "${TAB3}Would you like to add Ollama? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
+  msg_info "Setting up Intel® Repositories"
+  mkdir -p /usr/share/keyrings
+  curl -fsSL https://repositories.intel.com/gpu/intel-graphics.key | gpg --dearmor -o /usr/share/keyrings/intel-graphics.gpg 2>/dev/null || true
+  cat <<EOF >/etc/apt/sources.list.d/intel-gpu.sources
+Types: deb
+URIs: https://repositories.intel.com/gpu/ubuntu
+Suites: jammy
+Components: client
+Architectures: amd64 i386
+Signed-By: /usr/share/keyrings/intel-graphics.gpg
+EOF
+  curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg 2>/dev/null || true
+  cat <<EOF >/etc/apt/sources.list.d/oneAPI.sources
+Types: deb
+URIs: https://apt.repos.intel.com/oneapi
+Suites: all
+Components: main
+Signed-By: /usr/share/keyrings/oneapi-archive-keyring.gpg
+EOF
+  $STD apt update
+  msg_ok "Set up Intel® Repositories"
+
+  msg_info "Installing Intel® Level Zero"
+  $STD apt -y install intel-level-zero-gpu level-zero level-zero-dev 2>/dev/null || true
+  msg_ok "Installed Intel® Level Zero"
+
+  msg_info "Installing Intel® oneAPI Base Toolkit (Patience)"
+  $STD apt install -y --no-install-recommends intel-basekit-2024.1 2>/dev/null || true
+  msg_ok "Installed Intel® oneAPI Base Toolkit"
+
  msg_info "Installing Ollama"
  curl -fsSLO -C - https://ollama.com/download/ollama-linux-amd64.tgz
  tar -C /usr -xzf ollama-linux-amd64.tgz
--- a/install/plex-install.sh
+++ b/install/plex-install.sh
@ -13,16 +13,7 @@ setting_up_container
 network_check
 update_os

-msg_info "Setting Up Hardware Acceleration"
-$STD apt -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 msg_info "Setting Up Plex Media Server Repository"
 curl -fsSL https://downloads.plex.tv/plex-keys/PlexSign.key | tee /usr/share/keyrings/PlexSign.asc >/dev/null
--- a/install/tdarr-install.sh
+++ b/install/tdarr-install.sh
@ -28,32 +28,7 @@ $STD ./Tdarr_Updater
 rm -rf /opt/tdarr/Tdarr_Updater.zip
 msg_ok "Installed Tdarr"

-msg_info "Setting Up Hardware Acceleration"
-$STD apt -y install \
-  va-driver-all \
-  ocl-icd-libopencl1 \
-  vainfo \
-  intel-gpu-tools \
-  mesa-va-drivers \
-  mesa-vdpau-drivers \
-  intel-media-va-driver
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-  VIDEO_GID=$(getent group video | cut -d: -f3)
-  RENDER_GID=$(getent group render | cut -d: -f3)
-  if [[ -n "$VIDEO_GID" && -n "$RENDER_GID" ]]; then
-    sed -i "s/^video:x:[0-9]*:/video:x:$VIDEO_GID:/" /etc/group
-    sed -i "s/^render:x:[0-9]*:/render:x:$RENDER_GID:/" /etc/group
-  fi
-else
-  VIDEO_GID=$(getent group video | cut -d: -f3)
-  RENDER_GID=$(getent group render | cut -d: -f3)
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/tdarr-server.service
--- a/install/tunarr-install.sh
+++ b/install/tunarr-install.sh
@ -13,53 +13,7 @@ setting_up_container
 network_check
 update_os

-msg_info "Setting Up Hardware Acceleration"
-if [[ "$CTTYPE" == "0" ]]; then
-  $STD adduser "$(id -un)" video
-  $STD adduser "$(id -un)" render
-fi
-msg_ok "Base Hardware Acceleration Set Up"
-
-read -r -p "${TAB3}Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 13 only)? <y/N> " prompt
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Intel Hardware Acceleration (non-free)"
-  cat <<'EOF' >/etc/apt/sources.list.d/non-free.sources
-Types: deb deb-src
-URIs: http://deb.debian.org/debian
-Suites: trixie
-Components: non-free non-free-firmware
-
-Types: deb deb-src
-URIs: http://deb.debian.org/debian-security
-Suites: trixie-security
-Components: non-free non-free-firmware
-
-Types: deb deb-src
-URIs: http://deb.debian.org/debian
-Suites: trixie-updates
-Components: non-free non-free-firmware
-EOF
-
-  $STD apt update
-  $STD apt -y install \
-    intel-media-va-driver-non-free \
-    ocl-icd-libopencl1 \
-    mesa-opencl-icd \
-    mesa-va-drivers \
-    libvpl2 \
-    vainfo \
-    intel-gpu-tools
-else
-  msg_info "Installing Intel Hardware Acceleration (open packages)"
-  $STD apt -y install \
-    va-driver-all \
-    ocl-icd-libopencl1 \
-    mesa-opencl-icd \
-    mesa-va-drivers \
-    vainfo \
-    intel-gpu-tools
-fi
-msg_ok "Installed and Set Up Intel Hardware Acceleration"
+setup_hwaccel

 fetch_and_deploy_gh_release "tunarr" "chrisbenincasa/tunarr" "prebuild" "latest" "/opt/tunarr" "*linux-x64.tar.gz"
 cd /opt/tunarr
--- a/install/unmanic-install.sh
+++ b/install/unmanic-install.sh
@ -19,32 +19,7 @@ $STD apt install -y \
  python3-pip
 msg_ok "Installed Dependencies"

-msg_info "Setting Up Hardware Acceleration"
-$STD apt -y install \
-  va-driver-all \
-  ocl-icd-libopencl1 \
-  vainfo \
-  intel-gpu-tools \
-  mesa-va-drivers \
-  mesa-vdpau-drivers \
-  intel-media-va-driver
-if [[ "$CTTYPE" == "0" ]]; then
-  chgrp video /dev/dri
-  chmod 755 /dev/dri
-  chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
-  VIDEO_GID=$(getent group video | cut -d: -f3)
-  RENDER_GID=$(getent group render | cut -d: -f3)
-  if [[ -n "$VIDEO_GID" && -n "$RENDER_GID" ]]; then
-    sed -i "s/^video:x:[0-9]*:/video:x:$VIDEO_GID:/" /etc/group
-    sed -i "s/^render:x:[0-9]*:/render:x:$RENDER_GID:/" /etc/group
-  fi
-else
-  VIDEO_GID=$(getent group video | cut -d: -f3)
-  RENDER_GID=$(getent group render | cut -d: -f3)
-fi
-msg_ok "Set Up Hardware Acceleration"
+setup_hwaccel

 msg_info "Installing Unmanic"
 $STD pip3 install unmanic