From d183ff5c9ea535ddcc46ad0705aa12cfe9efba8b Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:31:39 +0200 Subject: [PATCH] Update build.func --- misc/build.func | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/misc/build.func b/misc/build.func index 8b0cc3fc..cef990b6 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1296,26 +1296,29 @@ such as 'intel-media-driver', 'libva2', or 'vainfo'." 15 74 IDX=0 DID_MOUNT_DRI=0 for dev in $SELECTED_DEVICES; do - dev=$(sed 's/"//g' <<<"$dev") + dev="${dev%\"}" # remove trailing " + dev="${dev#\"}" # remove leading " IFS=":" read -ra devices <<<"$dev" - for d in "${devices[@]}"; do - if [[ "$CT_TYPE" == "0" ]]; then - if [[ "$DID_MOUNT_DRI" -eq 0 && -d /dev/dri ]]; then - echo "lxc.mount.entry: /dev/dri /dev/dri none bind,optional,create=dir" >>"$LXC_CONFIG" - DID_MOUNT_DRI=1 + + for d in "${devices[@]}"; do + if [[ "$CT_TYPE" == "0" ]]; then + if [[ "$DID_MOUNT_DRI" -eq 0 && -d /dev/dri ]]; then + echo "lxc.mount.entry: /dev/dri /dev/dri none bind,optional,create=dir" >>"$LXC_CONFIG" + DID_MOUNT_DRI=1 + fi + if ! major_minor=$(stat -c '%t:%T' "$d" 2>/dev/null | awk -F: '{ printf "%d:%d", "0x"$1, "0x"$2 }'); then + msg_warn "Could not stat $d – skipping." + continue + fi + echo "lxc.cgroup2.devices.allow: c $major_minor rwm" >>"$LXC_CONFIG" + echo "lxc.mount.entry: $d $d none bind,optional,create=file" >>"$LXC_CONFIG" + else + GID=$([[ "$d" =~ render ]] && echo "$GID_RENDER" || echo "$GID_VIDEO") + echo "dev${IDX}: $d,gid=${GID}" >>"$LXC_CONFIG" + IDX=$((IDX + 1)) fi - if ! major_minor=$(stat -c '%t:%T' "$d" 2>/dev/null | awk -F: '{ printf "%d:%d", "0x"$1, "0x"$2 }'); then - msg_warn "Could not stat $d – skipping." - continue - fi - echo "lxc.cgroup2.devices.allow: c $major_minor rwm" >>"$LXC_CONFIG" - echo "lxc.mount.entry: $d $d none bind,optional,create=file" >>"$LXC_CONFIG" - else - GID=$([[ "$d" =~ render ]] && echo "$GID_RENDER" || echo "$GID_VIDEO") - echo "dev${IDX}: $d,gid=${GID}" >>"$LXC_CONFIG" - IDX=$((IDX + 1)) - fi + done done done else