update script vm synology

scripts/disk-passthrough_ct.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
 # ==========================================================
-# ProxMenu CT - A menu-driven script for Proxmox CT management
+# ProxMenu - A menu-driven script for Proxmox VE management
 # ==========================================================
-# Based on ProxMenu by MacRimi
+# Author      : MacRimi
-# Modified for Proxmox Containers
+# Copyright   : (c) 2024 MacRimi
+# License     : MIT (https://raw.githubusercontent.com/MacRimi/ProxMenux/main/LICENSE)
+# Version     : 1.0
+# Last Updated: 28/01/2025
 # ==========================================================
 # Description:
 # This script allows users to assign physical disks to existing

scripts/vm/synology.sh

@@ -485,52 +485,107 @@ function select_virtual_disk() {
 # ==========================================================
 function select_passthrough_disk() {
 
+  msg_info "$(translate "Detecting available disks...")"
 
   FREE_DISKS=()
 
-  # Get the list of mounted disks
   USED_DISKS=$(lsblk -n -o PKNAME,TYPE | grep 'lvm' | awk '{print "/dev/" $1}')
-  MOUNTED_DISKS=$(mount | grep -o '/dev/[a-z]*' | sort | uniq)
+  MOUNTED_DISKS=$(lsblk -ln -o NAME,MOUNTPOINT | awk '$2!="" {print "/dev/" $1}')
+
+  ZFS_DISKS=""
+  ZFS_RAW=$(zpool list -v -H 2>/dev/null | awk '{print $1}' | grep -v '^NAME$' | grep -v '^-' | grep -v '^mirror')
+
+  for entry in $ZFS_RAW; do
+      path=""
+      if [[ "$entry" == wwn-* || "$entry" == ata-* ]]; then
+          if [ -e "/dev/disk/by-id/$entry" ]; then
+              path=$(readlink -f "/dev/disk/by-id/$entry")
+          fi
+      elif [[ "$entry" == /dev/* ]]; then
+          path="$entry"
+      fi
+
+      if [ -n "$path" ]; then
+          base_disk=$(lsblk -no PKNAME "$path" 2>/dev/null)
+          if [ -n "$base_disk" ]; then
+              ZFS_DISKS+="/dev/$base_disk"$'\n'
+          fi
+      fi
+  done
+
+  ZFS_DISKS=$(echo "$ZFS_DISKS" | sort -u)
+  LVM_DEVICES=$(pvs --noheadings -o pv_name | xargs -n1 readlink -f | sort -u)
+  RAID_ACTIVE=$(grep -Po 'md\d+\s*:\s*active\s+raid[0-9]+' /proc/mdstat | awk '{print $1}' | sort -u)
 
   while read -r DISK; do
+      [[ "$DISK" =~ /dev/zd ]] && continue
 
-    if ! echo "$USED_DISKS" | grep -q "$DISK" && ! echo "$MOUNTED_DISKS" | grep -q "$DISK"; then
+      INFO=($(lsblk -dn -o MODEL,SIZE "$DISK"))
+      MODEL="${INFO[@]::${#INFO[@]}-1}"
+      SIZE="${INFO[-1]}"
+      LABEL=""
+      SHOW_DISK=true
 
-      MODEL=$(lsblk -dn -o MODEL "$DISK" | xargs)
+      IS_MOUNTED=false
-      SIZE=$(lsblk -dn -o SIZE "$DISK" | xargs)
+      IS_RAID=false
-      DESCRIPTION=$(printf "%-40s %10s" "$MODEL" "$SIZE")
+      IS_ZFS=false
-      FREE_DISKS+=("$DISK" "$DESCRIPTION" "OFF")
+      IS_LVM=false
-    fi
+
+      while read -r part fstype; do
+          [[ "$fstype" == "zfs_member" ]] && IS_ZFS=true
+          [[ "$fstype" == "linux_raid_member" ]] && IS_RAID=true
+          [[ "$fstype" == "LVM2_member" ]] && IS_LVM=true
+          if grep -q "/dev/$part" <<< "$MOUNTED_DISKS"; then
+              IS_MOUNTED=true
+          fi
+      done < <(lsblk -ln -o NAME,FSTYPE "$DISK" | tail -n +2)
+
+      REAL_PATH=$(readlink -f "$DISK")
+      if echo "$LVM_DEVICES" | grep -qFx "$REAL_PATH"; then
+          IS_MOUNTED=true
+      fi
+
+      if $IS_RAID && grep -q "$DISK" <<< "$(cat /proc/mdstat)" && grep -q "active raid" /proc/mdstat; then
+          SHOW_DISK=false
+      fi
+
+      if $IS_ZFS || $IS_MOUNTED || [[ "$ZFS_DISKS" == *"$DISK"* ]]; then
+          SHOW_DISK=false
+      fi
+
+      if $SHOW_DISK; then
+          [[ "$IS_RAID" == true ]] && LABEL+=" ⚠ with partitions"
+          [[ "$IS_LVM" == true ]] && LABEL+=" ⚠ LVM"
+          [[ "$IS_ZFS" == true ]] && LABEL+=" ⚠ ZFS"
+          DESCRIPTION=$(printf "%-30s %10s%s" "$MODEL" "$SIZE" "$LABEL")
+          FREE_DISKS+=("$DISK" "$DESCRIPTION" "OFF")
+      fi
   done < <(lsblk -dn -e 7,11 -o PATH)
 
 
-  # Handle no available disks
   if [ "${#FREE_DISKS[@]}" -eq 0 ]; then
+    cleanup
     whiptail --title "Error" --msgbox "$(translate "No disks available for this VM.")" 8 40
     select_disk_type
+    return
   fi
 
   MAX_WIDTH=$(printf "%s\n" "${FREE_DISKS[@]}" | awk '{print length}' | sort -nr | head -n1)
   TOTAL_WIDTH=$((MAX_WIDTH + 20)) 
-
+  [ $TOTAL_WIDTH -lt 70 ] && TOTAL_WIDTH=70
-  # Set a reasonable minimum width
+  cleanup
-  if [ $TOTAL_WIDTH -lt 70 ]; then
-    TOTAL_WIDTH=70
-  fi
-
-  # Display menu to select multiple free disks with dynamically calculated width
   SELECTED_DISKS=$(whiptail --title "Select Disks" --checklist \
     "$(translate "Select the disks you want to use (use spacebar to select):")" 20 $TOTAL_WIDTH 10 \
     "${FREE_DISKS[@]}" 3>&1 1>&2 2>&3)
 
-  # Check if at least one disk was selected
   if [ -z "$SELECTED_DISKS" ]; then
-        msg_error "Disk not specified. At least one disk is required."
+    msg_error "Disk not specified. At least one disk is required."
-        sleep 2
+    sleep 2
-        select_disk_type
+    select_disk_type
+    return
   fi
 
-  # Process selected disks
+
   msg_ok "Disk passthrough selected:"
   PASSTHROUGH_DISKS=()
   for DISK in $(echo "$SELECTED_DISKS" | tr -d '"'); do