From 1f1d6b984b005ddf001e3e65cb4685385856b907 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Thu, 19 Mar 2026 06:55:00 +0100
Subject: [PATCH] Reorder hwaccel setup and adjust GPU group usermod

Move setup_hwaccel invocations in emby, jellyfin, ollama, and plex installers to occur after package installation/configuration so GPU drivers/repos are present before enabling hardware acceleration. Update _setup_gpu_permissions to call usermod directly (remove $STD wrapper) when adding service users to render/video groups. Includes minor whitespace/ordering cleanups in the installer scripts.
---
 install/emby-install.sh     | 4 ++--
 install/jellyfin-install.sh | 3 ++-
 install/ollama-install.sh   | 4 ++--
 install/plex-install.sh     | 4 ++--
 misc/tools.func             | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/install/emby-install.sh b/install/emby-install.sh
index 84b879f3c..e7c29fbac 100644
--- a/install/emby-install.sh
+++ b/install/emby-install.sh
@@ -13,10 +13,10 @@ setting_up_container
 network_check
 update_os
 
-setup_hwaccel "emby"
-
 fetch_and_deploy_gh_release "emby" "MediaBrowser/Emby.Releases" "binary"
 
+setup_hwaccel "emby"
+
 motd_ssh
 customize
 cleanup_lxc
diff --git a/install/jellyfin-install.sh b/install/jellyfin-install.sh
index 36053270c..a25ac387f 100644
--- a/install/jellyfin-install.sh
+++ b/install/jellyfin-install.sh
@@ -14,7 +14,6 @@ network_check
 update_os
 
 msg_custom "ℹ️" "${GN}" "If NVIDIA GPU passthrough is detected, you'll be asked whether to install drivers in the container"
-setup_hwaccel "jellyfin"
 
 msg_info "Installing Dependencies"
 ensure_dependencies libjemalloc2
@@ -37,6 +36,8 @@ ln -sf /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin/ffmpeg
 ln -sf /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin/ffprobe
 msg_ok "Installed Jellyfin"
 
+setup_hwaccel "jellyfin"
+
 msg_info "Configuring Jellyfin"
 # Configure log rotation to prevent disk fill (keeps fail2ban compatibility) (PR: #1690 / Issue: #11224)
 cat <<EOF >/etc/logrotate.d/jellyfin
diff --git a/install/ollama-install.sh b/install/ollama-install.sh
index 2d050f60c..b3dfb3648 100644
--- a/install/ollama-install.sh
+++ b/install/ollama-install.sh
@@ -42,8 +42,6 @@ EOF
 $STD apt update
 msg_ok "Set up Intel® Repositories"
 
-setup_hwaccel "ollama"
-
 msg_info "Installing Intel® Level Zero"
 # Debian 13+ has newer Level Zero packages in system repos that conflict with Intel repo packages
 if is_debian && [[ "$(get_os_version_major)" -ge 13 ]]; then
@@ -92,6 +90,8 @@ fi
 $STD usermod -aG ollama $(id -u -n)
 msg_ok "Created ollama User and adjusted Groups"
 
+setup_hwaccel "ollama"
+
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/ollama.service
 [Unit]
diff --git a/install/plex-install.sh b/install/plex-install.sh
index 757bac495..8ed8bac6d 100644
--- a/install/plex-install.sh
+++ b/install/plex-install.sh
@@ -13,8 +13,6 @@ setting_up_container
 network_check
 update_os
 
-setup_hwaccel "plex"
-
 msg_info "Setting Up Plex Media Server Repository"
 setup_deb822_repo \
   "plexmediaserver" \
@@ -28,6 +26,8 @@ msg_info "Installing Plex Media Server"
 $STD apt install -y plexmediaserver
 msg_ok "Installed Plex Media Server"
 
+setup_hwaccel "plex"
+
 motd_ssh
 customize
 cleanup_lxc
diff --git a/misc/tools.func b/misc/tools.func
index 799d03c96..af2d21435 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -5213,8 +5213,8 @@ _setup_gpu_permissions() {
 
   # Add service user to render and video groups for GPU hardware acceleration
   if [[ -n "$service_user" ]]; then
-    $STD usermod -aG render "$service_user" 2>/dev/null || true
-    $STD usermod -aG video "$service_user" 2>/dev/null || true
+    usermod -aG render "$service_user" 2>/dev/null || true
+    usermod -aG video "$service_user" 2>/dev/null || true
   fi
 }