core: Fix VAAPI passthrough for unprivileged LXC containers via devX (#5875)

Author: MickLesk

misc/build.func

@@ -1142,64 +1142,48 @@ EOF
 
     echo ""
     msg_custom "⚙️ " "\e[96m" "Configuring VAAPI passthrough for LXC container"
-
     if [ "$CT_TYPE" != "0" ]; then
       msg_custom "⚠️ " "\e[33m" "Container is unprivileged – VAAPI passthrough may not work without additional host configuration (e.g., idmap)."
     fi
-
     msg_custom "ℹ️ " "\e[96m" "VAAPI enables GPU hardware acceleration (e.g., for video transcoding in Jellyfin or Plex)."
-
     echo ""
     read -rp "➤ Automatically mount all available VAAPI devices? [Y/n]: " VAAPI_ALL
 
     if [[ "$VAAPI_ALL" =~ ^[Yy]$|^$ ]]; then
-      # Mount all devices automatically
-      if [[ -e /dev/dri/renderD128 ]]; then
-        echo "lxc.cgroup2.devices.allow: c 226:128 rwm" >>"$LXC_CONFIG"
-        echo "lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file" >>"$LXC_CONFIG"
-      fi
-      if [[ -e /dev/dri/card0 ]]; then
-        echo "lxc.cgroup2.devices.allow: c 226:0 rwm" >>"$LXC_CONFIG"
-
-        echo "lxc.mount.entry: /dev/dri/card0 dev/dri/card0 none bind,optional,create=file" >>"$LXC_CONFIG"
-      fi
-      if [[ -e /dev/fb0 ]]; then
-        echo "lxc.cgroup2.devices.allow: c 29:0 rwm" >>"$LXC_CONFIG"
-        echo "lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file" >>"$LXC_CONFIG"
-      fi
-      if [[ -d /dev/dri ]]; then
-        echo "lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir" >>"$LXC_CONFIG"
-      fi
-    else
-      # Manual selection per device
-      if [[ -e /dev/dri/renderD128 ]]; then
-        read -rp "➤ Mount /dev/dri/renderD128 (GPU rendering)? [y/N]: " MOUNT_D128
-        if [[ "$MOUNT_D128" =~ ^[Yy]$ ]]; then
+      if [ "$CT_TYPE" == "0" ]; then
+        # PRV Container → alles zulässig
+        [[ -e /dev/dri/renderD128 ]] && {
           echo "lxc.cgroup2.devices.allow: c 226:128 rwm" >>"$LXC_CONFIG"
           echo "lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file" >>"$LXC_CONFIG"
-        fi
-      fi
-
-      if [[ -e /dev/dri/card0 ]]; then
-        read -rp "➤ Mount /dev/dri/card0 (GPU hardware interface)? [y/N]: " MOUNT_CARD0
-        if [[ "$MOUNT_CARD0" =~ ^[Yy]$ ]]; then
+        }
+        [[ -e /dev/dri/card0 ]] && {
           echo "lxc.cgroup2.devices.allow: c 226:0 rwm" >>"$LXC_CONFIG"
           echo "lxc.mount.entry: /dev/dri/card0 dev/dri/card0 none bind,optional,create=file" >>"$LXC_CONFIG"
-
-        fi
-      fi
-
-      if [[ -e /dev/fb0 ]]; then
-        read -rp "➤ Mount /dev/fb0 (Framebuffer, GUI)? [y/N]: " MOUNT_FB0
-        if [[ "$MOUNT_FB0" =~ ^[Yy]$ ]]; then
+        }
+        [[ -e /dev/fb0 ]] && {
           echo "lxc.cgroup2.devices.allow: c 29:0 rwm" >>"$LXC_CONFIG"
           echo "lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file" >>"$LXC_CONFIG"
-        fi
+        }
+        [[ -d /dev/dri ]] && {
+          echo "lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir" >>"$LXC_CONFIG"
+        }
+      else
+        # UNPRV Container → nur devX für UI
+        [[ -e /dev/dri/card0 ]] && echo "dev0: /dev/dri/card0,gid=44" >>"$LXC_CONFIG"
+        [[ -e /dev/dri/card1 ]] && echo "dev0: /dev/dri/card1,gid=44" >>"$LXC_CONFIG"
+        [[ -e /dev/dri/renderD128 ]] && echo "dev1: /dev/dri/renderD128,gid=104" >>"$LXC_CONFIG"
       fi
+    fi
 
-      if [[ -d /dev/dri ]]; then
-        echo "lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir" >>"$LXC_CONFIG"
-      fi
+  fi
+  if [ "$CT_TYPE" == "1" ] && [ "$is_vaapi_app" == "true" ]; then
+    if [[ -e /dev/dri/card0 ]]; then
+      echo "dev0: /dev/dri/card0,gid=44" >>"$LXC_CONFIG"
+    elif [[ -e /dev/dri/card1 ]]; then
+      echo "dev0: /dev/dri/card1,gid=44" >>"$LXC_CONFIG"
+    fi
+    if [[ -e /dev/dri/renderD128 ]]; then
+      echo "dev1: /dev/dri/renderD128,gid=104" >>"$LXC_CONFIG"
     fi
   fi
 

misc/core.func

@@ -355,7 +355,6 @@ msg_custom() {
   [[ -z "$msg" ]] && return
   stop_spinner
   echo -e "${BFR:-} ${symbol} ${color}${msg}${CL:-\e[0m}"
-  printf "\r\033[K\e[?25h\n"
 }
 
 run_container_safe() {