Revert changes from "Improve arm64 support and arch-specific downloads"

This reverts commit 231945dfa7.

misc/api.func

@@ -196,7 +196,7 @@ explain_exit_code() {
   103) echo "Validation: Shell is not Bash" ;;
   104) echo "Validation: Not running as root (or invoked via sudo)" ;;
   105) echo "Validation: Proxmox VE version not supported" ;;
-  106) echo "Validation: Architecture not supported (ARM / PiMox)" ;;
+  106) echo "Validation: Unsupported architecture (requires amd64 or arm64)" ;;
   107) echo "Validation: Kernel key parameters unreadable" ;;
   108) echo "Validation: Kernel key limits exceeded" ;;
   109) echo "Proxmox: No available container ID after max attempts" ;;
@@ -348,10 +348,10 @@ explain_exit_code() {
 json_escape() {
   # Escape a string for safe JSON embedding using awk (handles any input size).
   # Pipeline: strip ANSI → remove control chars → escape \ " TAB → join lines with \n
-  printf '%s' "$1" \
+  printf '%s' "$1" |
-    | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' \
+    sed 's/\x1b\[[0-9;]*[a-zA-Z]//g' |
-    | tr -d '\000-\010\013\014\016-\037\177\r' \
+    tr -d '\000-\010\013\014\016-\037\177\r' |
-    | awk '
+    awk '
         BEGIN { ORS = "" }
         {
           gsub(/\\/, "\\\\")   # backslash → \\

misc/build.func

@@ -1826,9 +1826,9 @@ advanced_settings() {
   while [ $STEP -le $MAX_STEP ]; do
     case $STEP in
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 1: Container Type
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     1)
       local default_on="ON"
       local default_off="OFF"
@@ -1851,9 +1851,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 2: Root Password
-    # ════════════════════════════════════════<EFBFBD><EFBFBD><EFBFBD>═══════════════════════════════<EFBFBD><EFBFBD><EFBFBD>══
+    # ------------------------------------------------------------------------------
     2)
       if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "ROOT PASSWORD" \
@@ -1905,9 +1905,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 3: Container ID
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     3)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CONTAINER ID" \
@@ -1939,9 +1939,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 4: Hostname
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     4)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "HOSTNAME" \
@@ -1962,9 +1962,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 5: Disk Size
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     5)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DISK SIZE" \
@@ -1983,9 +1983,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 6: CPU Cores
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     6)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CPU CORES" \
@@ -2004,9 +2004,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 7: RAM Size
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     7)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "RAM SIZE" \
@@ -2025,9 +2025,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 8: Network Bridge
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     8)
       if [[ ${#BRIDGE_MENU_OPTIONS[@]} -eq 0 ]]; then
         # Validate default bridge exists
@@ -2063,9 +2063,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 9: IPv4 Configuration
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     9)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "IPv4 CONFIGURATION" \
@@ -2160,9 +2160,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 10: IPv6 Configuration
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     10)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "IPv6 CONFIGURATION" \
@@ -2235,9 +2235,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 11: MTU Size
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     11)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "MTU SIZE" \
@@ -2255,9 +2255,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 12: DNS Search Domain
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     12)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DNS SEARCH DOMAIN" \
@@ -2271,9 +2271,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 13: DNS Server
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     13)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "DNS SERVER" \
@@ -2287,9 +2287,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 14: MAC Address
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     14)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "MAC ADDRESS" \
@@ -2307,9 +2307,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 15: VLAN Tag
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     15)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "VLAN TAG" \
@@ -2327,9 +2327,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 16: Tags
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     16)
       if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
         --title "CONTAINER TAGS" \
@@ -2349,18 +2349,18 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 17: SSH Settings
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     17)
       configure_ssh_settings "Step $STEP/$MAX_STEP"
       # configure_ssh_settings handles its own flow, always advance
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 18: FUSE Support
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     18)
       local fuse_default_flag="--defaultno"
       [[ "$_enable_fuse" == "yes" || "$_enable_fuse" == "1" ]] && fuse_default_flag=""
@@ -2382,9 +2382,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 19: TUN/TAP Support
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     19)
       local tun_default_flag="--defaultno"
       [[ "$_enable_tun" == "yes" || "$_enable_tun" == "1" ]] && tun_default_flag=""
@@ -2406,9 +2406,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 20: Nesting Support
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     20)
       local nesting_default_flag=""
       [[ "$_enable_nesting" == "0" || "$_enable_nesting" == "no" ]] && nesting_default_flag="--defaultno"
@@ -2436,9 +2436,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 21: GPU Passthrough
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     21)
       local gpu_default_flag="--defaultno"
       [[ "$_enable_gpu" == "yes" ]] && gpu_default_flag=""
@@ -2460,9 +2460,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 22: Keyctl Support (Docker/systemd)
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     22)
       local keyctl_default_flag="--defaultno"
       [[ "$_enable_keyctl" == "1" ]] && keyctl_default_flag=""
@@ -2484,9 +2484,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 23: APT Cacher Proxy
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     23)
       local apt_cacher_default_flag="--defaultno"
       [[ "$_apt_cacher" == "yes" ]] && apt_cacher_default_flag=""
@@ -2516,9 +2516,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 24: Container Timezone
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     24)
       local tz_hint="$_ct_timezone"
       [[ -z "$tz_hint" ]] && tz_hint="(empty - will use host timezone)"
@@ -2541,9 +2541,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 25: Container Protection
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     25)
       local protect_default_flag="--defaultno"
       [[ "$_protect_ct" == "yes" || "$_protect_ct" == "1" ]] && protect_default_flag=""
@@ -2565,9 +2565,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 26: Device Node Creation (mknod)
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     26)
       local mknod_default_flag="--defaultno"
       [[ "$_enable_mknod" == "1" ]] && mknod_default_flag=""
@@ -2589,9 +2589,9 @@ advanced_settings() {
       ((STEP++))
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 27: Mount Filesystems
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     27)
       local mount_hint=""
       [[ -n "$_mount_fs" ]] && mount_hint="$_mount_fs" || mount_hint="(none)"
@@ -2608,9 +2608,9 @@ advanced_settings() {
       fi
       ;;
 
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     # STEP 28: Verbose Mode & Confirmation
-    # ═══════════════════════════════════════════════════════════════════════════
+    # ------------------------------------------------------------------------------
     28)
       local verbose_default_flag="--defaultno"
       [[ "$_verbose" == "yes" ]] && verbose_default_flag=""
@@ -2676,9 +2676,9 @@ Advanced:
     esac
   done
 
-  # ═══════════════════════════════════════════════════════════════════════════
+  # ------------------------------------------------------------------------------
   # Apply all collected values to global variables
-  # ═══════════════════════════════════════════════════════════════════════════
+  # ------------------------------------------------------------------------------
   CT_TYPE="$_ct_type"
   PW="$_pw"
   CT_ID="$_ct_id"
@@ -2895,6 +2895,9 @@ echo_default() {
   echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE} GB${CL}"
   echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
   echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${CL}"
+  if [[ "$(dpkg --print-architecture)" == "arm64" ]]; then
+    echo -e "${INFO}${BOLD}${DGN}Architecture: ${BGN}arm64${CL}"
+  fi
   if [[ -n "${var_gpu:-}" && "${var_gpu}" == "yes" ]]; then
     echo -e "${GPU}${BOLD}${DGN}GPU Passthrough: ${BGN}Enabled${CL}"
   fi
@@ -3425,6 +3428,9 @@ start() {
     set_std_mode
     ensure_profile_loaded
     get_lxc_ip
+    if [[ "$(dpkg --print-architecture)" == "arm64" ]] && declare -f update_script_arm64 >/dev/null 2>&1; then
+      update_script_arm64
+    fi
     update_script
     update_motd_ip
     cleanup_lxc
@@ -3453,6 +3459,9 @@ start() {
     esac
     ensure_profile_loaded
     get_lxc_ip
+    if [[ "$(dpkg --print-architecture)" == "arm64" ]] && declare -f update_script_arm64 >/dev/null 2>&1; then
+      update_script_arm64
+    fi
     update_script
     update_motd_ip
     cleanup_lxc
@@ -4076,7 +4085,11 @@ EOF'
       msg_warn "Skipping timezone setup – zone '$tz' not found in container"
     fi
 
-    pct exec "$CTID" -- bash -c "apt-get update 2>&1 && apt-get install -y sudo curl mc gnupg2 jq 2>&1" >>"$BUILD_LOG" 2>&1 || {
+    local _base_pkgs="sudo curl mc gnupg2 jq"
+    if [[ "${ARCH:-amd64}" == "arm64" ]]; then
+      _base_pkgs+=" openssh-server wget gcc"
+    fi
+    pct exec "$CTID" -- bash -c "apt-get update 2>&1 && apt-get install -y ${_base_pkgs} 2>&1" >>"$BUILD_LOG" 2>&1 || {
       msg_error "apt-get base packages installation failed"
       install_exit_code=1
     }
@@ -4107,7 +4120,16 @@ EOF'
     # that sends "configuring" status AFTER the host already reported "failed"
     export CONTAINER_INSTALLING=true
 
-    lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh)"
+    local _install_script
+    _install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh")"
+    if [[ "$ARCH" == "arm64" ]]; then
+      local _arm_script
+      _arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/arm/${var_install}.sh" 2>/dev/null || true)"
+      if [[ -n "$_arm_script" ]]; then
+        _install_script="${_arm_script}"$'\n'"${_install_script}"
+      fi
+    fi
+    lxc-attach -n "$CTID" -- bash -c "$_install_script"
     local lxc_exit=$?
 
     unset CONTAINER_INSTALLING
@@ -4485,7 +4507,16 @@ EOF'
           # Re-run install script in existing container (don't destroy/recreate)
           set +Eeuo pipefail
           trap - ERR
-          lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh)"
+          local _install_script
+          _install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh")"
+          if [[ "$ARCH" == "arm64" ]]; then
+            local _arm_script
+            _arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/arm/${var_install}.sh" 2>/dev/null || true)"
+            if [[ -n "$_arm_script" ]]; then
+              _install_script="${_arm_script}"$'\n'"${_install_script}"
+            fi
+          fi
+          lxc-attach -n "$CTID" -- bash -c "$_install_script"
           local apt_retry_exit=$?
           set -Eeuo pipefail
           trap 'error_handler' ERR
@@ -5004,6 +5035,72 @@ create_lxc_container() {
     esac
   }
 
+  ARCH="$(dpkg --print-architecture)"
+
+  # Maps OS type + version to the release variant name used by ARM64 template sources.
+  arm64_template_variant() {
+    case "$1" in
+    debian)
+      case "$2" in
+      12 | 12.*) echo "bookworm" ;; 13 | 13.*) echo "trixie" ;;
+      *) echo "trixie" ;;
+      esac
+      ;;
+    alpine) echo "3.22" ;;
+    ubuntu)
+      case "$2" in
+      24.04* | noble) echo "noble" ;; 24.10* | oracular) echo "oracular" ;;
+      *) echo "jammy" ;;
+      esac
+      ;;
+    *) return 1 ;;
+    esac
+  }
+
+  # Downloads an ARM64 LXC rootfs template to $1.
+  # Debian: fetches latest release from community-scripts/debian-arm64-lxc on GitHub.
+  # Others: fetches from jenkins.linuxcontainers.org.
+  download_arm64_template() {
+    local dest="$1" url
+
+    mkdir -p "$(dirname "$dest")" || {
+      msg_error "Cannot create template dir."
+      exit 207
+    }
+
+    if [[ "$PCT_OSTYPE" == "debian" ]]; then
+      url=$(curl -fsSL "https://api.github.com/repos/community-scripts/debian-arm64-lxc/releases/latest" |
+        grep -Eo "https://[^\"]*debian-${CUSTOM_TEMPLATE_VARIANT}-arm64-rootfs\.tar\.xz" | head -n1)
+      [[ -n "$url" ]] || {
+        msg_error "Could not find Debian ${CUSTOM_TEMPLATE_VARIANT} ARM64 template URL."
+        exit 207
+      }
+    else
+      url="https://jenkins.linuxcontainers.org/job/image-${PCT_OSTYPE}/architecture=arm64,release=${CUSTOM_TEMPLATE_VARIANT},variant=default/lastStableBuild/artifact/rootfs.tar.xz"
+    fi
+
+    msg_info "Downloading ${PCT_OSTYPE^} ${CUSTOM_TEMPLATE_VARIANT} ARM64 template"
+    if ! curl -fsSL -o "$dest" "$url"; then
+      msg_error "Failed to download ARM64 template from: $url"
+      exit 208
+    fi
+    msg_ok "Downloaded ARM64 LXC template"
+  }
+
+  # Architecture-aware template download wrapper.
+  # Optional $1 overrides destination path (for local-storage fallback).
+  download_template() {
+    local dest="${1:-$TEMPLATE_PATH}"
+    if [[ "$ARCH" == "arm64" ]]; then
+      download_arm64_template "$dest"
+    else
+      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
+        msg_error "Failed to download template '$TEMPLATE' to storage '$TEMPLATE_STORAGE'"
+        exit 222
+      }
+    fi
+  }
+
   # ------------------------------------------------------------------------------
   # Required input variables
   # ------------------------------------------------------------------------------
@@ -5140,6 +5237,40 @@ create_lxc_container() {
   # ------------------------------------------------------------------------------
   # Template discovery & validation
   # ------------------------------------------------------------------------------
+  CUSTOM_TEMPLATE_VARIANT=""
+
+  if [[ "$ARCH" == "arm64" ]]; then
+    # ARM64: use custom template download from linuxcontainers.org / GitHub
+    msg_info "Preparing ARM64 template"
+
+    CUSTOM_TEMPLATE_VARIANT=$(arm64_template_variant "$PCT_OSTYPE" "${PCT_OSVERSION:-}") || {
+      msg_error "No ARM64 template mapping for ${PCT_OSTYPE} ${PCT_OSVERSION:-latest}"
+      exit 207
+    }
+
+    TEMPLATE="${PCT_OSTYPE}-${CUSTOM_TEMPLATE_VARIANT}-rootfs.tar.xz"
+    TEMPLATE_SOURCE="custom-arm64"
+
+    # Resolve template path: pvesm → storage.cfg fallback → default
+    TEMPLATE_PATH="$(pvesm path "${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE}" 2>/dev/null || true)"
+    if [[ -z "$TEMPLATE_PATH" ]]; then
+      local _tpl_base
+      _tpl_base=$(awk -v s="$TEMPLATE_STORAGE" '$1==s {f=1} f && /path/ {print $2; exit}' /etc/pve/storage.cfg)
+      TEMPLATE_PATH="${_tpl_base:-/var/lib/vz}/template/cache/$TEMPLATE"
+    fi
+
+    # Download if missing, too small, or corrupt (single pass)
+    if [[ ! -f "$TEMPLATE_PATH" ]]; then
+      download_arm64_template "$TEMPLATE_PATH"
+    elif [[ "$(stat -c%s "$TEMPLATE_PATH")" -lt 1000000 ]] || ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
+      msg_warn "Local template invalid – re-downloading."
+      rm -f "$TEMPLATE_PATH"
+      download_arm64_template "$TEMPLATE_PATH"
+    else
+      msg_ok "Template ${BL}$TEMPLATE${CL} found locally."
+    fi
+
+  else
     TEMPLATE_SEARCH="${PCT_OSTYPE}-${PCT_OSVERSION:-}"
     case "$PCT_OSTYPE" in
     debian | ubuntu) TEMPLATE_PATTERN="-standard_" ;;
@@ -5236,7 +5367,7 @@ create_lxc_container() {
           exit 0
         fi
       else
-      msg_error "No ${PCT_OSTYPE} templates available at all"
+        msg_error "No ${PCT_OSTYPE} templates available"
         exit 225
       fi
     fi
@@ -5272,7 +5403,7 @@ create_lxc_container() {
           done
 
           echo ""
-        read -p "Select version [1-${#AVAILABLE_VERSIONS[@]}] or Enter to exit: " choice </dev/tty
+          read -p "Select version [1-${#AVAILABLE_VERSIONS[@]}] or press Enter to exit: " choice </dev/tty
 
           if [[ "$choice" =~ ^[0-9]+$ ]] && [[ "$choice" -ge 1 ]] && [[ "$choice" -le ${#AVAILABLE_VERSIONS[@]} ]]; then
             export var_version="${AVAILABLE_VERSIONS[$((choice - 1))]}"
@@ -5345,21 +5476,21 @@ create_lxc_container() {
 
     NEED_DOWNLOAD=0
     if [[ ! -f "$TEMPLATE_PATH" ]]; then
-    msg_info "Template not present locally – will download."
+      msg_info "Template not present locally, will download it."
       NEED_DOWNLOAD=1
     elif [[ ! -r "$TEMPLATE_PATH" ]]; then
-    msg_error "Template file exists but is not readable – check permissions."
+      msg_error "Template file exists but is not readable, check permissions."
       exit 221
     elif [[ "$(stat -c%s "$TEMPLATE_PATH")" -lt 1000000 ]]; then
       if [[ -n "$ONLINE_TEMPLATE" ]]; then
-      msg_warn "Template file too small (<1MB) – re-downloading."
+        msg_warn "Template file too small (<1MB), re-downloading."
         NEED_DOWNLOAD=1
       else
         msg_warn "Template looks too small, but no online version exists. Keeping local file."
       fi
     elif ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
       if [[ -n "$ONLINE_TEMPLATE" ]]; then
-      msg_warn "Template appears corrupted – re-downloading."
+        msg_warn "Template appears corrupted, re-downloading."
         NEED_DOWNLOAD=1
       else
         msg_warn "Template appears corrupted, but no online version exists. Keeping local file."
@@ -5398,6 +5529,7 @@ create_lxc_container() {
       msg_error "Template $TEMPLATE not available in storage $TEMPLATE_STORAGE after download."
       exit 223
     fi
+  fi
 
   # ------------------------------------------------------------------------------
   # Dynamic preflight for Debian 13.x: offer upgrade if available (no hard mins)
@@ -5475,19 +5607,13 @@ create_lxc_container() {
   if [[ ! -s "$TEMPLATE_PATH" || "$(stat -c%s "$TEMPLATE_PATH" 2>/dev/null || echo 0)" -lt 1000000 ]]; then
     msg_info "Template file missing or too small – downloading"
     rm -f "$TEMPLATE_PATH"
-    pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
+    download_template
-      msg_error "Failed to download template '$TEMPLATE' to storage '$TEMPLATE_STORAGE'"
-      exit 222
-    }
     msg_ok "Template downloaded"
   elif ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then
-    if [[ -n "$ONLINE_TEMPLATE" ]]; then
+    if [[ "$ARCH" == "arm64" || -n "$ONLINE_TEMPLATE" ]]; then
       msg_info "Template appears corrupted – re-downloading"
       rm -f "$TEMPLATE_PATH"
-      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 || {
+      download_template
-        msg_error "Failed to re-download template '$TEMPLATE'"
-        exit 222
-      }
       msg_ok "Template re-downloaded"
     else
       msg_warn "Template appears corrupted, but no online version exists. Skipping re-download."
@@ -5508,7 +5634,7 @@ create_lxc_container() {
     if grep -qiE 'unable to open|corrupt|invalid' "$LOGFILE"; then
       msg_info "Template may be corrupted – re-downloading"
       rm -f "$TEMPLATE_PATH"
-      pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1
+      download_template
       msg_ok "Template re-downloaded"
     fi
 
@@ -5521,7 +5647,11 @@ create_lxc_container() {
         if [[ ! -f "$LOCAL_TEMPLATE_PATH" ]]; then
           msg_ok "Trying local storage fallback"
           msg_info "Downloading template to local"
+          if [[ "$ARCH" == "arm64" ]]; then
+            download_arm64_template "$LOCAL_TEMPLATE_PATH"
+          else
             pveam download local "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1
+          fi
           msg_ok "Template downloaded to local"
         else
           msg_ok "Trying local storage fallback"

misc/core.func

@@ -344,9 +344,15 @@ pve_check() {
 # - Provides link to ARM64-compatible scripts
 # ------------------------------------------------------------------------------
 arch_check() {
-  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
+  local arch
-    msg_error "This script will not work with PiMox (ARM architecture detected)."
+  arch="$(dpkg --print-architecture)"
-    msg_warn "Visit https://github.com/asylumexp/Proxmox for ARM64 support."
+  if [[ "$arch" != "amd64" && "$arch" != "arm64" ]]; then
+    msg_error "This script requires amd64 or arm64 (detected: $arch)."
+    sleep 2
+    exit 106
+  fi
+  if [[ "$arch" == "arm64" && "${var_arm64:-}" != "yes" ]]; then
+    msg_error "This script does not yet support arm64."
     sleep 2
     exit 106
   fi

misc/error_handler.func

@@ -99,7 +99,7 @@ if ! declare -f explain_exit_code &>/dev/null; then
     103) echo "Validation: Shell is not Bash" ;;
     104) echo "Validation: Not running as root (or invoked via sudo)" ;;
     105) echo "Validation: Proxmox VE version not supported" ;;
-    106) echo "Validation: Architecture not supported (ARM / PiMox)" ;;
+    106) echo "Validation: Unsupported architecture (requires amd64 or arm64)" ;;
     107) echo "Validation: Kernel key parameters unreadable" ;;
     108) echo "Validation: Kernel key limits exceeded" ;;
     109) echo "Proxmox: No available container ID after max attempts" ;;

misc/tools.func

@@ -2822,10 +2822,13 @@ function fetch_and_deploy_codeberg_release() {
     # Fall back to architecture heuristic
     if [[ -z "$url_match" ]]; then
       for u in $assets; do
-        if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
+        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+          [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
+        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
+          [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
+        fi
         url_match="$u"
         break
-        fi
       done
     fi
 
@@ -3122,7 +3125,11 @@ _gh_scan_older_releases() {
         done)
       fi
       if [[ "$has_match" != "true" ]]; then
-        has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE "($arch|amd64|x86_64|aarch64|arm64).*\.deb$" && echo true)
+        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+          has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(amd64|x86_64).*\.deb$' && echo true)
+        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
+          has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(arm64|aarch64).*\.deb$' && echo true)
+        fi
       fi
       if [[ "$has_match" != "true" ]]; then
         has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '\.deb$' && echo true)
@@ -3328,10 +3335,13 @@ function fetch_and_deploy_gh_release() {
     # If no match via explicit pattern, fall back to architecture heuristic
     if [[ -z "$url_match" ]]; then
       for u in $assets; do
-        if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
+        if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+          [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
+        elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
+          [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
+        fi
         url_match="$u"
         break
-        fi
       done
     fi
 
@@ -3362,10 +3372,13 @@ function fetch_and_deploy_gh_release() {
         fi
         if [[ -z "$url_match" ]]; then
           for u in $assets; do
-            if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
+            if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
+              [[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
+            elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
+              [[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
+            fi
             url_match="$u"
             break
-            fi
           done
         fi
         if [[ -z "$url_match" ]]; then
@@ -3733,7 +3746,12 @@ function setup_ffmpeg() {
 
   # Binary fallback mode
   if [[ "$TYPE" == "binary" ]]; then
-    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
+    local ffmpeg_arch
+    case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
+    arm64) ffmpeg_arch="arm64" ;;
+    *) ffmpeg_arch="amd64" ;;
+    esac
+    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${ffmpeg_arch}-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
       msg_error "Failed to download FFmpeg binary"
       rm -rf "$TMP_DIR"
       return 1
@@ -3815,7 +3833,12 @@ function setup_ffmpeg() {
   # If no source download (either VERSION empty or download failed), use binary
   if [[ -z "$VERSION" ]]; then
     msg_info "Setup FFmpeg from pre-built binary"
-    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
+    local ffmpeg_arch
+    case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
+    arm64) ffmpeg_arch="arm64" ;;
+    *) ffmpeg_arch="amd64" ;;
+    esac
+    if ! CURL_TIMEOUT=300 curl_with_retry "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-${ffmpeg_arch}-static.tar.xz" "$TMP_DIR/ffmpeg.tar.xz"; then
       msg_error "Failed to download FFmpeg pre-built binary"
       rm -rf "$TMP_DIR"
       return 1
@@ -7881,7 +7904,12 @@ function setup_yq() {
     msg_info "Setup yq $LATEST_VERSION"
   fi
 
-  if ! curl_with_retry "https://github.com/${GITHUB_REPO}/releases/download/v${LATEST_VERSION}/yq_linux_amd64" "$TMP_DIR/yq"; then
+  local yq_arch
+  case "$(dpkg --print-architecture 2>/dev/null || echo amd64)" in
+  arm64) yq_arch="arm64" ;;
+  *) yq_arch="amd64" ;;
+  esac
+  if ! curl_with_retry "https://github.com/${GITHUB_REPO}/releases/download/v${LATEST_VERSION}/yq_linux_${yq_arch}" "$TMP_DIR/yq"; then
     msg_error "Failed to download yq"
     rm -rf "$TMP_DIR"
     return 1