Merge remote-tracking branch 'upstream/main'

misc/build.func

@@ -65,13 +65,36 @@ root_check() {
 
 # This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported.
 pve_check() {
-  if ! pveversion | grep -Eq "pve-manager/8\.[0-4](\.[0-9]+)*"; then
-    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
-    echo -e "Requires Proxmox Virtual Environment Version 8.1 or later."
-    echo -e "Exiting..."
-    sleep 2
-    exit
+  local PVE_VER
+  PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
+
+  # Check for Proxmox VE 8.x
+  if [[ "$PVE_VER" =~ ^8\.([0-9]+) ]]; then
+    local MINOR="${BASH_REMATCH[1]}"
+    if ((MINOR < 1 || MINOR > 4)); then
+      msg_error "This version of Proxmox VE is not supported."
+      echo -e "Required: Proxmox VE version 8.1 – 8.4"
+      exit 1
+    fi
+    return 0
   fi
+
+  # Check for Proxmox VE 9.x (Beta) — require confirmation
+  if [[ "$PVE_VER" =~ ^9\.([0-9]+) ]]; then
+    if whiptail --title "Proxmox 9.x Detected (Beta)" \
+      --yesno "You are using Proxmox VE $PVE_VER, which is currently in Beta state.\n\nThis version is experimentally supported.\n\nDo you want to proceed anyway?" 12 70; then
+      msg_ok "Confirmed: Continuing with Proxmox VE $PVE_VER"
+      return 0
+    else
+      msg_error "Aborted by user: Proxmox VE 9.x was not confirmed."
+      exit 1
+    fi
+  fi
+
+  # All other unsupported versions
+  msg_error "This version of Proxmox VE is not supported."
+  echo -e "Supported versions: Proxmox VE 8.1 – 8.4 or 9.x (Beta, with confirmation)"
+  exit 1
 }
 
 # When a node is running tens of containers, it's possible to exceed the kernel's cryptographic key storage allocations.
@@ -1207,7 +1230,52 @@ EOF
   # This starts the container and executes <app>-install.sh
   msg_info "Starting LXC Container"
   pct start "$CTID"
-  msg_ok "Started LXC Container"
+
+  # wait for status 'running'
+  for i in {1..10}; do
+    if pct status "$CTID" | grep -q "status: running"; then
+      msg_ok "Started LXC Container"
+      break
+    fi
+    sleep 1
+    if [ "$i" -eq 10 ]; then
+      msg_error "LXC Container did not reach running state"
+      exit 1
+    fi
+  done
+
+  if [ "$var_os" != "alpine" ]; then
+    msg_info "Waiting for network in LXC container"
+    for i in {1..10}; do
+      if pct exec "$CTID" -- ping -c1 -W1 deb.debian.org >/dev/null 2>&1; then
+        msg_ok "Network in LXC is reachable"
+        break
+      fi
+      if [ "$i" -lt 10 ]; then
+        msg_warn "No network yet in LXC (try $i/10) – waiting..."
+        sleep 3
+      else
+        msg_error "No network in LXC after waiting."
+        read -r -p "Set fallback DNS (1.1.1.1/8.8.8.8)? [y/N]: " choice
+        case "$choice" in
+        [yY]*)
+          pct set "$CTID" --nameserver 1.1.1.1
+          pct set "$CTID" --nameserver 8.8.8.8
+          if pct exec "$CTID" -- ping -c1 -W1 deb.debian.org >/dev/null 2>&1; then
+            msg_ok "Network reachable after DNS fallback"
+          else
+            msg_error "Still no network/DNS in LXC! Aborting customization."
+            exit 1
+          fi
+          ;;
+        *)
+          msg_error "Aborted by user – no DNS fallback set."
+          exit 1
+          ;;
+        esac
+      fi
+    done
+  fi
 
   msg_info "Customizing LXC Container"
   : "${tz:=Etc/UTC}"
@@ -1217,7 +1285,7 @@ EOF
 http://dl-cdn.alpinelinux.org/alpine/latest-stable/main
 http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
 EOF'
-    pct exec "$CTID" -- ash -c "apk add bash newt curl openssh nano mc ncurses >/dev/null"
+    pct exec "$CTID" -- ash -c "apk add bash newt curl openssh nano mc ncurses jq >/dev/null"
   else
     sleep 3
     pct exec "$CTID" -- bash -c "sed -i '/$LANG/ s/^# //' /etc/locale.gen"
@@ -1235,7 +1303,7 @@ EOF'
       msg_warn "Skipping timezone setup – zone '$tz' not found in container"
     fi
 
-    pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gnupg2 >/dev/null"
+    pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gnupg2 jq >/dev/null"
   fi
   msg_ok "Customized LXC Container"