Merge pull request #388 from community-scripts/feat/use_new_core_features

feat: Add default and advanced install method selection

Author: michelroegl-brunner

scripts/core/alpine-tools.func

@@ -2441,10 +2441,15 @@ build_container() {
     if echo "$pci_vga_info" | grep -q "\[10de:"; then
       msg_custom "🎮" "${GN}" "Detected NVIDIA GPU"
 
-      # Simple passthrough - just bind /dev/nvidia* devices if they exist
-      for d in /dev/nvidia* /dev/nvidiactl /dev/nvidia-modeset /dev/nvidia-uvm /dev/nvidia-uvm-tools; do
-        [[ -e "$d" ]] && NVIDIA_DEVICES+=("$d")
+      for d in /dev/nvidia*; do
+        [[ -c "$d" ]] && NVIDIA_DEVICES+=("$d")
       done
+      # Also check for devices inside /dev/nvidia-caps/ directory
+      if [[ -d /dev/nvidia-caps ]]; then
+        for d in /dev/nvidia-caps/*; do
+          [[ -c "$d" ]] && NVIDIA_DEVICES+=("$d")
+        done
+      fi
 
       if [[ ${#NVIDIA_DEVICES[@]} -gt 0 ]]; then
         msg_custom "🎮" "${GN}" "Found ${#NVIDIA_DEVICES[@]} NVIDIA device(s) for passthrough"
@@ -2954,15 +2959,14 @@ fix_gpu_gids() {
 
   # For privileged containers: also fix permissions inside container
   if [[ "$CT_TYPE" == "0" ]]; then
-    pct exec "$CTID" -- bash -c "
+     pct exec "$CTID" -- sh -c "
       if [ -d /dev/dri ]; then
         for dev in /dev/dri/*; do
           if [ -e \"\$dev\" ]; then
-            if [[ \"\$dev\" =~ renderD ]]; then
-              chgrp ${render_gid} \"\$dev\" 2>/dev/null || true
-            else
-              chgrp ${video_gid} \"\$dev\" 2>/dev/null || true
-            fi
+             case \"\$dev\" in
+              *renderD*) chgrp ${render_gid} \"\$dev\" 2>/dev/null || true ;;
+              *)         chgrp ${video_gid} \"\$dev\" 2>/dev/null || true ;;
+            esac
             chmod 660 \"\$dev\" 2>/dev/null || true
           fi
         done
@@ -3211,42 +3215,26 @@ create_lxc_container() {
     fi
   fi
 
-  # Validate content types
-  msg_info "Validating content types of storage '$CONTAINER_STORAGE'"
-  STORAGE_CONTENT=$(grep -A4 -E "^(zfspool|dir|lvmthin|lvm|linstor): $CONTAINER_STORAGE" /etc/pve/storage.cfg | grep content | awk '{$1=""; print $0}' | xargs)
-  msg_debug "Storage '$CONTAINER_STORAGE' has content types: $STORAGE_CONTENT"
-
-  # Check storage type for special handling
-  STORAGE_TYPE=$(grep -E "^[^:]+: $CONTAINER_STORAGE$" /etc/pve/storage.cfg | cut -d: -f1)
-  if [[ "$STORAGE_TYPE" == "linstor" ]]; then
-    msg_info "Detected LINSTOR storage - verifying cluster connectivity"
-    if ! pvesm status -storage "$CONTAINER_STORAGE" &>/dev/null; then
-      msg_error "LINSTOR storage '$CONTAINER_STORAGE' not accessible. Check LINSTOR cluster health."
-      exit 217
-    fi
-  fi
-
-  grep -qw "rootdir" <<<"$STORAGE_CONTENT" || {
-    msg_error "Storage '$CONTAINER_STORAGE' does not support 'rootdir'. Cannot create LXC."
-    exit 217
-  }
-  $STD msg_ok "Storage '$CONTAINER_STORAGE' supports 'rootdir'"
+  msg_info "Validating storage '$CONTAINER_STORAGE'"
+  STORAGE_TYPE=$(grep -E "^[^:]+: $CONTAINER_STORAGE$" /etc/pve/storage.cfg | cut -d: -f1 | head -1)
 
-  msg_info "Validating content types of template storage '$TEMPLATE_STORAGE'"
-  TEMPLATE_CONTENT=$(grep -A4 -E "^[^:]+: $TEMPLATE_STORAGE" /etc/pve/storage.cfg | grep content | awk '{$1=""; print $0}' | xargs)
-  msg_debug "Template storage '$TEMPLATE_STORAGE' has content types: $TEMPLATE_CONTENT"
+  case "$STORAGE_TYPE" in
+  iscsidirect) exit 212 ;;
+  iscsi | zfs) exit 213 ;;
+  cephfs) exit 219 ;;
+  pbs) exit 224 ;;
+  linstor | rbd | nfs | cifs)
+    pvesm status -storage "$CONTAINER_STORAGE" &>/dev/null || exit 217
+    ;;
+  esac
 
-  # Check if template storage is LINSTOR (may need special handling)
-  TEMPLATE_TYPE=$(grep -E "^[^:]+: $TEMPLATE_STORAGE$" /etc/pve/storage.cfg | cut -d: -f1)
-  if [[ "$TEMPLATE_TYPE" == "linstor" ]]; then
-    msg_info "Template storage uses LINSTOR - ensuring resource availability"
-  fi
+  pvesm status -content rootdir 2>/dev/null | awk 'NR>1{print $1}' | grep -qx "$CONTAINER_STORAGE" || exit 213Add a comment on  line R3227Add diff commentMarkdown input:  edit mode selected.WritePreviewAdd a suggestionHeadingBoldItalicQuoteCodeLinkUnordered listNumbered listTask listMentionReferenceSaved repliesAdd FilesPaste, drop, or click to add filesCancelCommentStart a reviewReturn to code
+  msg_ok "Storage '$CONTAINER_STORAGE' ($STORAGE_TYPE) validated"
 
-  if ! grep -qw "vztmpl" <<<"$TEMPLATE_CONTENT"; then
-    msg_warn "Template storage '$TEMPLATE_STORAGE' does not declare 'vztmpl'. This may cause pct create to fail."
-  else
-    $STD msg_ok "Template storage '$TEMPLATE_STORAGE' supports 'vztmpl'"
+  if ! pvesm status -content vztmpl 2>/dev/null | awk 'NR>1{print $1}' | grep -qx "$TEMPLATE_STORAGE"; then
+    msg_warn "Template storage '$TEMPLATE_STORAGE' may not support 'vztmpl'"
   fi
+  msg_ok "Template storage '$TEMPLATE_STORAGE' validated"
 
   # Free space check
   STORAGE_FREE=$(pvesm status | awk -v s="$CONTAINER_STORAGE" '$1 == s { print $6 }')
@@ -3261,7 +3249,7 @@ create_lxc_container() {
     msg_info "Checking cluster quorum"
     if ! pvecm status | awk -F':' '/^Quorate/ { exit ($2 ~ /Yes/) ? 0 : 1 }'; then
       msg_error "Cluster is not quorate. Start all nodes or configure quorum device (QDevice)."
-      exit 201
+      exit 210
     fi
     msg_ok "Cluster is quorate"
   fi
@@ -3417,6 +3405,15 @@ create_lxc_container() {
           ONLINE_TEMPLATE=""
           [[ ${#ONLINE_TEMPLATES[@]} -gt 0 ]] && ONLINE_TEMPLATE="${ONLINE_TEMPLATES[-1]}"
 
+          if [[ ${#ONLINE_TEMPLATES[@]} -gt 0 ]]; then
+           count=0
+            for idx in "${!ONLINE_TEMPLATES[@]}"; do
+                ((count++))
+              [[ $count -ge 3 ]] && break
+            done
+            ONLINE_TEMPLATE="${ONLINE_TEMPLATES[$idx]}"
+          fi
+
           if [[ ${#LOCAL_TEMPLATES[@]} -gt 0 ]]; then
             TEMPLATE="${LOCAL_TEMPLATES[-1]}"
             TEMPLATE_SOURCE="local"
@@ -3554,7 +3551,7 @@ create_lxc_container() {
   }
   flock -w 60 9 || {
     msg_error "Timeout while waiting for template lock."
-    exit 202
+    exit 211
   }
 
   LOGFILE="/tmp/pct_create_${CTID}_$(date +%Y%m%d_%H%M%S)_${SESSION_ID}.log"
@@ -3604,11 +3601,11 @@ create_lxc_container() {
             2)
               echo "Upgrade was declined. Please update and re-run:
                 apt update && apt install --only-upgrade pve-container lxc-pve"
-              exit 213
+              exit 231
               ;;
             3)
               echo "Upgrade and/or retry failed. Please inspect: $LOGFILE"
-              exit 213
+              exit 231
               ;;
             esac
           else