Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-04-25 08:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update add_gpu_vm.sh

Browse Source
This commit is contained in:
MacRimi
2026-04-06 22:51:30 +02:00
parent c429d391f5
commit 840e8a774e
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/gpu_tpu/add_gpu_vm.sh
View File

@@ -436,12 +436,12 @@ ensure_selected_gpu_not_already_in_target_vm() {
fi fi
local choice local choice
choice=$(dialog --clear --backtitle "ProxMenux" --colors \ choice=$(dialog --stdout --clear --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU Already Assigned to This VM')" \ --title "$(translate 'GPU Already Assigned to This VM')" \
--menu "\n$(translate 'The selected GPU is already present in this VM. Select another GPU to continue:')" \ --menu "\n$(translate 'The selected GPU is already present in this VM. Select another GPU to continue:')" \
18 82 10 \ 18 82 10 \
"${menu_items[@]}" \ "${menu_items[@]}" \
3>&1 1>&2 2>&3) || exit 0 2>/dev/tty) || exit 0
SELECTED_GPU="${ALL_GPU_TYPES[$choice]}" SELECTED_GPU="${ALL_GPU_TYPES[$choice]}"
SELECTED_GPU_PCI="${ALL_GPU_PCIS[$choice]}" SELECTED_GPU_PCI="${ALL_GPU_PCIS[$choice]}"
@@ -630,12 +630,12 @@ select_gpu() {
done done
local choice local choice
choice=$(dialog --clear --backtitle "ProxMenux" --colors \ choice=$(dialog --stdout --clear --backtitle "ProxMenux" --colors \
--title "$(translate 'Select GPU for VM Passthrough')" \ --title "$(translate 'Select GPU for VM Passthrough')" \
--menu "\n$(translate 'Select the GPU to pass through to the VM:')" \ --menu "\n$(translate 'Select the GPU to pass through to the VM:')" \
18 82 10 \ 18 82 10 \
"${menu_items[@]}" \ "${menu_items[@]}" \
3>&1 1>&2 2>&3) || exit 0 2>/dev/tty) || exit 0
SELECTED_GPU="${ALL_GPU_TYPES[$choice]}" SELECTED_GPU="${ALL_GPU_TYPES[$choice]}"
SELECTED_GPU_PCI="${ALL_GPU_PCIS[$choice]}" SELECTED_GPU_PCI="${ALL_GPU_PCIS[$choice]}"
@@ -1100,12 +1100,12 @@ select_vm() {
exit 0 exit 0
fi fi
SELECTED_VMID=$(dialog --backtitle "ProxMenux" \ SELECTED_VMID=$(dialog --stdout --backtitle "ProxMenux" \
--title "$(translate 'Select Virtual Machine')" \ --title "$(translate 'Select Virtual Machine')" \
--menu "\n$(translate 'Select the VM to add the GPU to:')" \ --menu "\n$(translate 'Select the VM to add the GPU to:')" \
20 72 12 \ 20 72 12 \
"${menu_items[@]}" \ "${menu_items[@]}" \
2>&1 >/dev/tty) || exit 0 2>/dev/tty) || exit 0
VM_NAME=$(qm config "$SELECTED_VMID" 2>/dev/null | grep "^name:" | awk '{print $2}') VM_NAME=$(qm config "$SELECTED_VMID" 2>/dev/null | grep "^name:" | awk '{print $2}')
} }
@@ -1206,13 +1206,13 @@ check_switch_mode() {
msg+="\Z1\Zb$(translate 'Start on boot enabled (onboot=1)'): ${onboot_count}\Zn\n" msg+="\Z1\Zb$(translate 'Start on boot enabled (onboot=1)'): ${onboot_count}\Zn\n"
msg+="\n\Z1$(translate 'After this LXC → VM switch, reboot the host so the new binding state is applied cleanly.')\Zn" msg+="\n\Z1$(translate 'After this LXC → VM switch, reboot the host so the new binding state is applied cleanly.')\Zn"
action_choice=$(dialog --backtitle "ProxMenux" --colors \ action_choice=$(dialog --stdout --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU Used in LXC Containers')" \ --title "$(translate 'GPU Used in LXC Containers')" \
--default-item "2" \ --default-item "2" \
--menu "$msg" 25 96 8 \ --menu "$msg" 25 96 8 \
"1" "$(translate 'Keep GPU in LXC config (disable Start on boot)')" \ "1" "$(translate 'Keep GPU in LXC config (disable Start on boot)')" \
"2" "$(translate 'Remove GPU from LXC config (keep Start on boot)')" \ "2" "$(translate 'Remove GPU from LXC config (keep Start on boot)')" \
2>&1 >/dev/tty) || exit 0 2>/dev/tty) || exit 0
case "$action_choice" in case "$action_choice" in
1) LXC_SWITCH_ACTION="keep_gpu_disable_onboot" ;; 1) LXC_SWITCH_ACTION="keep_gpu_disable_onboot" ;;
@@ -1288,13 +1288,13 @@ check_switch_mode() {
msg+="$(translate 'Choose conflict policy for the source VM:')" msg+="$(translate 'Choose conflict policy for the source VM:')"
local vm_action_choice local vm_action_choice
vm_action_choice=$(dialog --clear --backtitle "ProxMenux" --colors \ vm_action_choice=$(dialog --stdout --clear --backtitle "ProxMenux" --colors \
--title "$(translate 'GPU Already Assigned to Another VM')" \ --title "$(translate 'GPU Already Assigned to Another VM')" \
--default-item "1" \ --default-item "1" \
--menu "$msg" 24 98 8 \ --menu "$msg" 24 98 8 \
"1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \ "1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \
"2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \ "2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \
3>&1 1>&2 2>&3) || exit 0 2>/dev/tty) || exit 0
case "$vm_action_choice" in case "$vm_action_choice" in
1) SWITCH_VM_ACTION="keep_gpu_disable_onboot" ;; 1) SWITCH_VM_ACTION="keep_gpu_disable_onboot" ;;
@@ -1774,8 +1774,12 @@ configure_vm() {
if _is_pci_function_assigned_to_vm "$SELECTED_GPU_PCI" "$SELECTED_VMID"; then if _is_pci_function_assigned_to_vm "$SELECTED_GPU_PCI" "$SELECTED_VMID"; then
msg_ok "$(translate 'GPU already present in target VM — existing hostpci entry reused')" | tee -a "$screen_capture" msg_ok "$(translate 'GPU already present in target VM — existing hostpci entry reused')" | tee -a "$screen_capture"
else else
qm set "$SELECTED_VMID" --hostpci${idx} "${SELECTED_GPU_PCI},${gpu_opts}" >>"$LOG_FILE" 2>&1 if qm set "$SELECTED_VMID" --hostpci${idx} "${SELECTED_GPU_PCI},${gpu_opts}" >>"$LOG_FILE" 2>&1; then
msg_ok "$(translate 'GPU added'): hostpci${idx}: ${SELECTED_GPU_PCI},${gpu_opts}" | tee -a "$screen_capture" msg_ok "$(translate 'GPU added'): hostpci${idx}: ${SELECTED_GPU_PCI},${gpu_opts}" | tee -a "$screen_capture"
else
msg_error "$(translate 'Failed to add GPU to target VM'): ${SELECTED_GPU_PCI}" | tee -a "$screen_capture"
return 1
fi
idx=$((idx + 1)) idx=$((idx + 1))
fi fi
@@ -1786,8 +1790,12 @@ configure_vm() {
msg_ok "$(translate 'Device already present in target VM — existing hostpci entry reused'): ${dev}" | tee -a "$screen_capture" msg_ok "$(translate 'Device already present in target VM — existing hostpci entry reused'): ${dev}" | tee -a "$screen_capture"
continue continue
fi fi
qm set "$SELECTED_VMID" --hostpci${idx} "${dev},pcie=1" >>"$LOG_FILE" 2>&1 if qm set "$SELECTED_VMID" --hostpci${idx} "${dev},pcie=1" >>"$LOG_FILE" 2>&1; then
msg_ok "$(translate 'Device added'): hostpci${idx}: ${dev},pcie=1" | tee -a "$screen_capture" msg_ok "$(translate 'Device added'): hostpci${idx}: ${dev},pcie=1" | tee -a "$screen_capture"
else
msg_error "$(translate 'Failed to add IOMMU group device'): ${dev}" | tee -a "$screen_capture"
return 1
fi
idx=$((idx + 1)) idx=$((idx + 1))
done done
@@ -1797,13 +1805,18 @@ configure_vm() {
msg_ok "$(translate 'GPU audio already present in target VM — existing hostpci entry reused'): ${dev}" | tee -a "$screen_capture" msg_ok "$(translate 'GPU audio already present in target VM — existing hostpci entry reused'): ${dev}" | tee -a "$screen_capture"
continue continue
fi fi
qm set "$SELECTED_VMID" --hostpci${idx} "${dev},pcie=1" >>"$LOG_FILE" 2>&1 if qm set "$SELECTED_VMID" --hostpci${idx} "${dev},pcie=1" >>"$LOG_FILE" 2>&1; then
msg_ok "$(translate 'GPU audio added'): hostpci${idx}: ${dev},pcie=1" | tee -a "$screen_capture" msg_ok "$(translate 'GPU audio added'): hostpci${idx}: ${dev},pcie=1" | tee -a "$screen_capture"
else
msg_error "$(translate 'Failed to add GPU audio function'): ${dev}" | tee -a "$screen_capture"
return 1
fi
idx=$((idx + 1)) idx=$((idx + 1))
done done
# NVIDIA: hide KVM hypervisor from guest # NVIDIA: hide KVM hypervisor from guest
[[ "$SELECTED_GPU" == "nvidia" ]] && _configure_nvidia_kvm_hide [[ "$SELECTED_GPU" == "nvidia" ]] && _configure_nvidia_kvm_hide
return 0
} }
_configure_nvidia_kvm_hide() { _configure_nvidia_kvm_hide() {
@@ -1896,7 +1909,12 @@ main() {
cleanup_lxc_configs cleanup_lxc_configs
cleanup_vm_config cleanup_vm_config
ensure_vm_display_std ensure_vm_display_std
configure_vm if ! configure_vm; then
msg_error "$(translate 'VM passthrough configuration failed. Review the log and VM config.')"
[[ "$WIZARD_CALL" == "true" ]] && _set_wizard_result "failed"
rm -f "$screen_capture"
exit 1
fi
if declare -F attach_proxmenux_gpu_guard_to_vm >/dev/null 2>&1; then if declare -F attach_proxmenux_gpu_guard_to_vm >/dev/null 2>&1; then
ensure_proxmenux_gpu_guard_hookscript ensure_proxmenux_gpu_guard_hookscript
attach_proxmenux_gpu_guard_to_vm "$SELECTED_VMID" attach_proxmenux_gpu_guard_to_vm "$SELECTED_VMID"