Report install start/failure to telemetry API

Add telemetry hooks in misc/build.func: call post_to_api at installation start to capture early or immediately-failing installs, and call post_update_to_api with status "failed" and the install exit code when a container installation fails. This improves visibility into install failures for monitoring/telemetry.
Start install timer and refine error reporting
2026-02-13 19:06:39 +03:00 · 2026-02-12 11:24:19 +01:00 · 2026-02-12 11:21:40 +01:00 · 2026-02-12 10:42:19 +01:00
34 changed files with 90 additions and 371 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -401,48 +401,8 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 </details>

-## 2026-02-13
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - [Hotfix] Jotty: Copy contents of config backup into /opt/jotty/config [@vhsdream](https://github.com/vhsdream) ([#11864](https://github.com/community-scripts/ProxmoxVE/pull/11864))
-
 ## 2026-02-12

-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - EMQX: increase disk to 6GB and add optional MQ disable prompt [@MickLesk](https://github.com/MickLesk) ([#11844](https://github.com/community-scripts/ProxmoxVE/pull/11844))
-    - Increased the Grafana container default disk size. [@shtefko](https://github.com/shtefko) ([#11840](https://github.com/community-scripts/ProxmoxVE/pull/11840))
-    - Pangolin: Update database generation command in install script [@tremor021](https://github.com/tremor021) ([#11825](https://github.com/community-scripts/ProxmoxVE/pull/11825))
-    - Deluge: add python3-setuptools as dep [@MickLesk](https://github.com/MickLesk) ([#11833](https://github.com/community-scripts/ProxmoxVE/pull/11833))
-    - Dispatcharr: migrate to uv sync [@MickLesk](https://github.com/MickLesk) ([#11831](https://github.com/community-scripts/ProxmoxVE/pull/11831))
-
-  - #### ✨ New Features
-
-    - Archlinux-VM: fix LVM/LVM-thin storage and improve error reporting | VM's add correct exit_code for analytics [@MickLesk](https://github.com/MickLesk) ([#11842](https://github.com/community-scripts/ProxmoxVE/pull/11842))
-    - Debian13-VM: Optimize First Boot & add noCloud/Cloud Selection [@MickLesk](https://github.com/MickLesk) ([#11810](https://github.com/community-scripts/ProxmoxVE/pull/11810))
-
-### 💾 Core
-
-  - #### ✨ New Features
-
-    - tools.func: auto-detect binary vs armored GPG keys in setup_deb822_repo [@MickLesk](https://github.com/MickLesk) ([#11841](https://github.com/community-scripts/ProxmoxVE/pull/11841))
-    - core: remove old Go API and extend misc/api.func with new backend [@MickLesk](https://github.com/MickLesk) ([#11822](https://github.com/community-scripts/ProxmoxVE/pull/11822))
-
-  - #### 🔧 Refactor
-
-    - error_handler: prevent stuck 'installing' status [@MickLesk](https://github.com/MickLesk) ([#11845](https://github.com/community-scripts/ProxmoxVE/pull/11845))
-
-### 🧰 Tools
-
-  - #### 🐞 Bug Fixes
-
-    - Tailscale: fix DNS check and keyrings directory issues [@MickLesk](https://github.com/MickLesk) ([#11837](https://github.com/community-scripts/ProxmoxVE/pull/11837))
-
 ## 2026-02-11

 ### 🆕 New Scripts
--- a/ct/alpine-grafana.sh
+++ b/ct/alpine-grafana.sh
@@ -9,7 +9,7 @@ APP="Alpine-Grafana"
 var_tags="${var_tags:-alpine;monitoring}"
 var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-256}"
-var_disk="${var_disk:-2}"
+var_disk="${var_disk:-1}"
 var_os="${var_os:-alpine}"
 var_version="${var_version:-3.23}"
 var_unprivileged="${var_unprivileged:-1}"
--- a/ct/deluge.sh
+++ b/ct/deluge.sh
@@ -28,7 +28,6 @@ function update_script() {
    exit
  fi
  msg_info "Updating Deluge"
-  ensure_dependencies python3-setuptools
  $STD apt update
  $STD pip3 install deluge[all] --upgrade
  msg_ok "Updated Deluge"
--- a/ct/dispatcharr.sh
+++ b/ct/dispatcharr.sh
@@ -104,7 +104,7 @@ function update_script() {
    cd /opt/dispatcharr
    rm -rf .venv
    $STD uv venv --clear
-    $STD uv sync
+    $STD uv pip install -r requirements.txt --index-strategy unsafe-best-match
    $STD uv pip install gunicorn gevent celery redis daphne
    msg_ok "Updated Dispatcharr Backend"

--- a/ct/emqx.sh
+++ b/ct/emqx.sh
@@ -9,7 +9,7 @@ APP="EMQX"
 var_tags="${var_tags:-mqtt}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-1024}"
-var_disk="${var_disk:-6}"
+var_disk="${var_disk:-4}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
--- a/ct/grafana.sh
+++ b/ct/grafana.sh
@@ -9,7 +9,7 @@ APP="Grafana"
 var_tags="${var_tags:-monitoring;visualization}"
 var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
-var_disk="${var_disk:-4}"
+var_disk="${var_disk:-2}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
--- a/ct/jotty.sh
+++ b/ct/jotty.sh
@@ -46,7 +46,7 @@ function update_script() {
    msg_info "Restoring configuration & data"
    mv /opt/app.env /opt/jotty/.env
    [[ -d /opt/data ]] && mv /opt/data /opt/jotty/data
-    [[ -d /opt/jotty/config ]] && cp -a /opt/config/* /opt/jotty/config && rm -rf /opt/config
+    [[ -d /opt/jotty/config ]] && mv /opt/config/* /opt/jotty/config
    msg_ok "Restored configuration & data"

    msg_info "Starting Service"
--- a/ct/pangolin.sh
+++ b/ct/pangolin.sh
@@ -51,7 +51,7 @@ function update_script() {
    $STD npm run db:generate
    $STD npm run build
    $STD npm run build:cli
-    $STD npm run db:push
+    $STD npm run db:sqlite:push
    cp -R .next/standalone ./
    chmod +x ./dist/cli.mjs
    cp server/db/names.json ./dist/names.json
--- a/frontend/public/json/emqx.json
+++ b/frontend/public/json/emqx.json
@@ -21,7 +21,7 @@
      "resources": {
        "cpu": 2,
        "ram": 1024,
-        "hdd": 6,
+        "hdd": 4,
        "os": "debian",
        "version": "13"
      }
--- a/frontend/public/json/github-versions.json
+++ b/frontend/public/json/github-versions.json
@@ -1,5 +1,5 @@
 {
-  "generated": "2026-02-13T06:23:00Z",
+  "generated": "2026-02-12T06:25:40Z",
  "versions": [
    {
      "slug": "2fauth",
@@ -193,9 +193,9 @@
    {
      "slug": "cleanuparr",
      "repo": "Cleanuparr/Cleanuparr",
-      "version": "v2.6.0",
+      "version": "v2.5.1",
      "pinned": false,
-      "date": "2026-02-13T00:14:21Z"
+      "date": "2026-01-11T00:46:17Z"
    },
    {
      "slug": "cloudreve",
@@ -298,9 +298,9 @@
    {
      "slug": "donetick",
      "repo": "donetick/donetick",
-      "version": "v0.1.73",
+      "version": "v0.1.71",
      "pinned": false,
-      "date": "2026-02-12T23:42:30Z"
+      "date": "2026-02-11T06:01:13Z"
    },
    {
      "slug": "drawio",
@@ -403,9 +403,9 @@
    {
      "slug": "ghostfolio",
      "repo": "ghostfolio/ghostfolio",
-      "version": "2.238.0",
+      "version": "2.237.0",
      "pinned": false,
-      "date": "2026-02-12T18:28:55Z"
+      "date": "2026-02-08T13:59:53Z"
    },
    {
      "slug": "gitea",
@@ -543,9 +543,9 @@
    {
      "slug": "huntarr",
      "repo": "plexguide/Huntarr.io",
-      "version": "9.2.4.1",
+      "version": "9.2.3",
      "pinned": false,
-      "date": "2026-02-12T22:17:47Z"
+      "date": "2026-02-07T04:44:20Z"
    },
    {
      "slug": "immich-public-proxy",
@@ -571,16 +571,16 @@
    {
      "slug": "invoiceninja",
      "repo": "invoiceninja/invoiceninja",
-      "version": "v5.12.59",
+      "version": "v5.12.57",
      "pinned": false,
-      "date": "2026-02-13T02:26:13Z"
+      "date": "2026-02-11T23:08:56Z"
    },
    {
      "slug": "jackett",
      "repo": "Jackett/Jackett",
-      "version": "v0.24.1103",
+      "version": "v0.24.1098",
      "pinned": false,
-      "date": "2026-02-13T05:53:23Z"
+      "date": "2026-02-12T05:56:25Z"
    },
    {
      "slug": "jellystat",
@@ -599,9 +599,9 @@
    {
      "slug": "jotty",
      "repo": "fccview/jotty",
-      "version": "1.20.0",
+      "version": "1.19.1",
      "pinned": false,
-      "date": "2026-02-12T09:23:30Z"
+      "date": "2026-01-26T21:30:39Z"
    },
    {
      "slug": "kapowarr",
@@ -823,9 +823,9 @@
    {
      "slug": "metube",
      "repo": "alexta69/metube",
-      "version": "2026.02.12",
+      "version": "2026.02.08",
      "pinned": false,
-      "date": "2026-02-12T21:05:49Z"
+      "date": "2026-02-08T17:01:37Z"
    },
    {
      "slug": "miniflux",
@@ -998,9 +998,9 @@
    {
      "slug": "pangolin",
      "repo": "fosrl/pangolin",
-      "version": "1.15.4",
+      "version": "1.15.3",
      "pinned": false,
-      "date": "2026-02-13T00:54:02Z"
+      "date": "2026-02-12T06:10:19Z"
    },
    {
      "slug": "paperless-ai",
@@ -1292,9 +1292,9 @@
    {
      "slug": "scraparr",
      "repo": "thecfu/scraparr",
-      "version": "v3.0.3",
+      "version": "v3.0.1",
      "pinned": false,
-      "date": "2026-02-12T14:20:56Z"
+      "date": "2026-02-11T17:42:23Z"
    },
    {
      "slug": "seelf",
@@ -1432,9 +1432,9 @@
    {
      "slug": "termix",
      "repo": "Termix-SSH/Termix",
-      "version": "release-1.11.1-tag",
+      "version": "release-1.11.0-tag",
      "pinned": false,
-      "date": "2026-02-13T04:49:16Z"
+      "date": "2026-01-25T02:09:52Z"
    },
    {
      "slug": "the-lounge",
@@ -1460,9 +1460,9 @@
    {
      "slug": "tianji",
      "repo": "msgbyte/tianji",
-      "version": "v1.31.12",
+      "version": "v1.31.10",
      "pinned": false,
-      "date": "2026-02-12T19:06:14Z"
+      "date": "2026-02-04T17:21:04Z"
    },
    {
      "slug": "traccar",
@@ -1551,9 +1551,9 @@
    {
      "slug": "upsnap",
      "repo": "seriousm4x/UpSnap",
-      "version": "5.2.8",
+      "version": "5.2.7",
      "pinned": false,
-      "date": "2026-02-13T00:02:37Z"
+      "date": "2026-01-07T23:48:00Z"
    },
    {
      "slug": "uptimekuma",
--- a/frontend/public/json/grafana.json
+++ b/frontend/public/json/grafana.json
@@ -21,7 +21,7 @@
            "resources": {
                "cpu": 1,
                "ram": 512,
-                "hdd": 4,
+                "hdd": 2,
                "os": "debian",
                "version": "13"
            }
@@ -32,7 +32,7 @@
            "resources": {
                "cpu": 1,
                "ram": 256,
-                "hdd": 2,
+                "hdd": 1,
                "os": "alpine",
                "version": "3.23"
            }
--- a/install/deluge-install.sh
+++ b/install/deluge-install.sh
@@ -16,8 +16,7 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt install -y \
  python3-pip \
-  python3-libtorrent \
-  python3-setuptools
+  python3-libtorrent
 msg_ok "Installed Dependencies"

 msg_info "Installing Deluge"
--- a/install/dispatcharr-install.sh
+++ b/install/dispatcharr-install.sh
@@ -37,7 +37,7 @@ fetch_and_deploy_gh_release "dispatcharr" "Dispatcharr/Dispatcharr" "tarball"
 msg_info "Installing Python Dependencies with uv"
 cd /opt/dispatcharr
 $STD uv venv --clear
-$STD uv sync
+$STD uv pip install -r requirements.txt --index-strategy unsafe-best-match
 $STD uv pip install gunicorn gevent celery redis daphne
 msg_ok "Installed Python Dependencies"

--- a/install/emqx-install.sh
+++ b/install/emqx-install.sh
@@ -38,18 +38,6 @@ rm -f "$DEB_FILE"
 echo "$LATEST_VERSION" >~/.emqx
 msg_ok "Installed EMQX"

-read -r -p "${TAB3}Would you like to disable the EMQX MQ feature? (reduces disk/CPU usage) <y/N> " prompt
-if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-  msg_info "Disabling EMQX MQ feature"
-  mkdir -p /etc/emqx
-  if ! grep -q "^mq.enable" /etc/emqx/emqx.conf 2>/dev/null; then
-    echo "mq.enable = false" >>/etc/emqx/emqx.conf
-  else
-    sed -i 's/^mq.enable.*/mq.enable = false/' /etc/emqx/emqx.conf
-  fi
-  msg_ok "Disabled EMQX MQ feature"
-fi
-
 msg_info "Starting EMQX service"
 $STD systemctl enable -q --now emqx
 msg_ok "Enabled EMQX service"
--- a/install/pangolin-install.sh
+++ b/install/pangolin-install.sh
@@ -178,7 +178,7 @@ http:
        servers:
          - url: "http://$LOCAL_IP:3000"
 EOF
-$STD npm run db:push
+$STD npm run db:sqlite:push

 . /etc/os-release
 if [ "$VERSION_CODENAME" = "trixie" ]; then
--- a/misc/api.func
+++ b/misc/api.func
@@ -353,9 +353,6 @@ detect_ram() {
 # - Never blocks or fails script execution
 # ------------------------------------------------------------------------------
 post_to_api() {
-  # Prevent duplicate submissions (post_to_api is called from multiple places)
-  [[ "${POST_TO_API_DONE:-}" == "true" ]] && return 0
-
  # Silent fail - telemetry should never break scripts
  command -v curl &>/dev/null || {
    [[ "${DEV_MODE:-}" == "true" ]] && echo "[DEBUG] curl not found, skipping" >&2
@@ -443,8 +440,6 @@ EOF
      -H "Content-Type: application/json" \
      -d "$JSON_PAYLOAD" &>/dev/null || true
  fi
-
-  POST_TO_API_DONE=true
 }

 # ------------------------------------------------------------------------------
@@ -456,7 +451,6 @@ EOF
 #   * ct_type=2 (VM instead of LXC)
 #   * type="vm"
 #   * Disk size without 'G' suffix
-# - Includes hardware detection: CPU, GPU, RAM speed
 # - Only executes if DIAGNOSTICS=yes and RANDOM_UUID is set
 # - Never blocks or fails script execution
 # ------------------------------------------------------------------------------
@@ -479,27 +473,6 @@ post_to_api_vm() {
    pve_version=$(pveversion 2>/dev/null | awk -F'[/ ]' '{print $2}') || true
  fi

-  # Detect GPU if not already set
-  if [[ -z "${GPU_VENDOR:-}" ]]; then
-    detect_gpu
-  fi
-  local gpu_vendor="${GPU_VENDOR:-unknown}"
-  local gpu_model="${GPU_MODEL:-}"
-  local gpu_passthrough="${GPU_PASSTHROUGH:-unknown}"
-
-  # Detect CPU if not already set
-  if [[ -z "${CPU_VENDOR:-}" ]]; then
-    detect_cpu
-  fi
-  local cpu_vendor="${CPU_VENDOR:-unknown}"
-  local cpu_model="${CPU_MODEL:-}"
-
-  # Detect RAM if not already set
-  if [[ -z "${RAM_SPEED:-}" ]]; then
-    detect_ram
-  fi
-  local ram_speed="${RAM_SPEED:-}"
-
  # Remove 'G' suffix from disk size
  local DISK_SIZE_API="${DISK_SIZE%G}"

@@ -519,12 +492,6 @@ post_to_api_vm() {
    "os_version": "${var_version:-}",
    "pve_version": "${pve_version}",
    "method": "${METHOD:-default}",
-    "cpu_vendor": "${cpu_vendor}",
-    "cpu_model": "${cpu_model}",
-    "gpu_vendor": "${gpu_vendor}",
-    "gpu_model": "${gpu_model}",
-    "gpu_passthrough": "${gpu_passthrough}",
-    "ram_speed": "${ram_speed}",
    "repo_source": "${REPO_SOURCE}"
 }
 EOF
--- a/misc/error_handler.func
+++ b/misc/error_handler.func
@@ -243,18 +243,6 @@ error_handler() {
 # ------------------------------------------------------------------------------
 on_exit() {
  local exit_code=$?
-  # Report orphaned "installing" records to telemetry API
-  # Catches ALL exit paths: errors (non-zero), signals, AND clean exits where
-  # post_to_api was called ("installing" sent) but post_update_to_api was never called
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if declare -f post_update_to_api >/dev/null 2>&1; then
-      if [[ $exit_code -ne 0 ]]; then
-        post_update_to_api "failed" "$exit_code"
-      else
-        post_update_to_api "failed" "1"
-      fi
-    fi
-  fi
  [[ -n "${lockfile:-}" && -e "$lockfile" ]] && rm -f "$lockfile"
  exit "$exit_code"
 }
@@ -267,10 +255,6 @@ on_exit() {
 # - Exits with code 130 (128 + SIGINT=2)
 # ------------------------------------------------------------------------------
 on_interrupt() {
-  # Report interruption to telemetry API (prevents stuck "installing" records)
-  if declare -f post_update_to_api >/dev/null 2>&1; then
-    post_update_to_api "failed" "130"
-  fi
  if declare -f msg_error >/dev/null 2>&1; then
    msg_error "Interrupted by user (SIGINT)"
  else
@@ -288,10 +272,6 @@ on_interrupt() {
 # - Triggered by external process termination
 # ------------------------------------------------------------------------------
 on_terminate() {
-  # Report termination to telemetry API (prevents stuck "installing" records)
-  if declare -f post_update_to_api >/dev/null 2>&1; then
-    post_update_to_api "failed" "143"
-  fi
  if declare -f msg_error >/dev/null 2>&1; then
    msg_error "Terminated by signal (SIGTERM)"
  else
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -465,7 +465,6 @@ manage_tool_repository() {
      msg_error "Failed to download MongoDB GPG key"
      return 1
    fi
-    chmod 644 "/etc/apt/keyrings/mongodb-server-${version}.gpg"

    # Setup repository
    local distro_codename
@@ -1295,33 +1294,12 @@ setup_deb822_repo() {
    return 1
  }

-  # Import GPG key (auto-detect binary vs ASCII-armored format)
-  local tmp_gpg
-  tmp_gpg=$(mktemp) || return 1
-  curl -fsSL "$gpg_url" -o "$tmp_gpg" || {
-    msg_error "Failed to download GPG key for ${name}"
-    rm -f "$tmp_gpg"
+  # Import GPG
+  curl -fsSL "$gpg_url" | gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" || {
+    msg_error "Failed to import GPG key for ${name}"
    return 1
  }

-  if grep -q "BEGIN PGP" "$tmp_gpg" 2>/dev/null; then
-    # ASCII-armored — dearmor to binary
-    gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" < "$tmp_gpg" || {
-      msg_error "Failed to dearmor GPG key for ${name}"
-      rm -f "$tmp_gpg"
-      return 1
-    }
-  else
-    # Already in binary GPG format — copy directly
-    cp "$tmp_gpg" "/etc/apt/keyrings/${name}.gpg" || {
-      msg_error "Failed to install GPG key for ${name}"
-      rm -f "$tmp_gpg"
-      return 1
-    }
-  fi
-  rm -f "$tmp_gpg"
-  chmod 644 "/etc/apt/keyrings/${name}.gpg"
-
  # Write deb822
  {
    echo "Types: deb"
--- a/tools/addon/add-tailscale-lxc.sh
+++ b/tools/addon/add-tailscale-lxc.sh
@@ -75,37 +75,14 @@ pct exec "$CTID" -- bash -c '
 set -e
 export DEBIAN_FRONTEND=noninteractive

-# Source os-release properly (handles quoted values)
-source /etc/os-release
+ID=$(grep "^ID=" /etc/os-release | cut -d"=" -f2)
+VER=$(grep "^VERSION_CODENAME=" /etc/os-release | cut -d"=" -f2)

-# Fallback if DNS is poisoned or blocked
+# fallback if DNS is poisoned or blocked
 ORIG_RESOLV="/etc/resolv.conf"
 BACKUP_RESOLV="/tmp/resolv.conf.backup"

-# Check DNS resolution using multiple methods (dig may not be installed)
-dns_check_failed=true
-if command -v dig &>/dev/null; then
-  if dig +short pkgs.tailscale.com 2>/dev/null | grep -qvE "^127\.|^0\.0\.0\.0$|^$"; then
-    dns_check_failed=false
-  fi
-elif command -v host &>/dev/null; then
-  if host pkgs.tailscale.com 2>/dev/null | grep -q "has address"; then
-    dns_check_failed=false
-  fi
-elif command -v nslookup &>/dev/null; then
-  if nslookup pkgs.tailscale.com 2>/dev/null | grep -q "Address:"; then
-    dns_check_failed=false
-  fi
-elif command -v getent &>/dev/null; then
-  if getent hosts pkgs.tailscale.com &>/dev/null; then
-    dns_check_failed=false
-  fi
-else
-  # No DNS tools available, try curl directly and assume DNS works
-  dns_check_failed=false
-fi
-
-if $dns_check_failed; then
+if ! dig +short pkgs.tailscale.com | grep -qvE "^127\.|^0\.0\.0\.0$"; then
  echo "[INFO] DNS resolution for pkgs.tailscale.com failed (blocked or redirected)."
  echo "[INFO] Temporarily overriding /etc/resolv.conf with Cloudflare DNS (1.1.1.1)"
  cp "$ORIG_RESOLV" "$BACKUP_RESOLV"
@@ -115,22 +92,17 @@ fi
 if ! command -v curl &>/dev/null; then
  echo "[INFO] curl not found, installing..."
  apt-get update -qq
- apt update -qq
- apt install -y curl >/dev/null
+  apt-get install -y curl >/dev/null
 fi

-# Ensure keyrings directory exists
-mkdir -p /usr/share/keyrings
-
-curl -fsSL "https://pkgs.tailscale.com/stable/${ID}/${VERSION_CODENAME}.noarmor.gpg" \
+curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${VER}.noarmor.gpg \
  | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null

-echo "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/${ID} ${VERSION_CODENAME} main" \
+echo "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/${ID} ${VER} main" \
  >/etc/apt/sources.list.d/tailscale.list

 apt-get update -qq
-apt update -qq
-apt install -y tailscale >/dev/null
+apt-get install -y tailscale >/dev/null

 if [[ -f /tmp/resolv.conf.backup ]]; then
  echo "[INFO] Restoring original /etc/resolv.conf"
--- a/vm/archlinux-vm.sh
+++ b/vm/archlinux-vm.sh
@@ -70,7 +70,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -203,6 +203,7 @@ function exit-script() {

 function default_settings() {
  VMID=$(get_valid_nextid)
+  FORMAT=",efitype=4m"
  MACHINE=""
  DISK_SIZE="4G"
  DISK_CACHE=""
@@ -258,9 +259,11 @@ function advanced_settings() {
    3>&1 1>&2 2>&3); then
    if [ "$MACH" = q35 ]; then
      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}"
+      FORMAT=""
      MACHINE=" -machine q35"
    else
      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}"
+      FORMAT=",efitype=4m"
      MACHINE=""
    fi
  else
@@ -473,45 +476,31 @@ case $STORAGE_TYPE in
 nfs | dir | cifs)
  DISK_EXT=".qcow2"
  DISK_REF="$VMID/"
-  DISK_IMPORT="--format qcow2"
+  DISK_IMPORT="-format qcow2"
  THIN=""
  ;;
 btrfs)
  DISK_EXT=".raw"
  DISK_REF="$VMID/"
-  DISK_IMPORT="--format raw"
+  DISK_IMPORT="-format raw"
+  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="--format raw"
-  ;;
 esac
+for i in {0,1}; do
+  disk="DISK$i"
+  eval DISK"${i}"=vm-"${VMID}"-disk-"${i}"${DISK_EXT:-}
+  eval DISK"${i}"_REF="${STORAGE}":"${DISK_REF:-}"${!disk}
+done

 msg_info "Creating a Arch Linux VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
-
-if qm disk import --help >/dev/null 2>&1; then
-  IMPORT_CMD=(qm disk import)
-else
-  IMPORT_CMD=(qm importdisk)
-fi
-
-IMPORT_OUT="$("${IMPORT_CMD[@]}" "$VMID" "${FILE}" "$STORAGE" ${DISK_IMPORT:-} 2>&1 || true)"
-DISK_REF_IMPORTED="$(printf '%s\n' "$IMPORT_OUT" | sed -n "s/.*successfully imported disk '\([^']\+\)'.*/\1/p" | tr -d "\r\"'")"
-[[ -z "$DISK_REF_IMPORTED" ]] && DISK_REF_IMPORTED="$(pvesm list "$STORAGE" | awk -v id="$VMID" '$5 ~ ("vm-"id"-disk-") {print $1":"$5}' | sort | tail -n1)"
-[[ -z "$DISK_REF_IMPORTED" ]] && {
-  msg_error "Unable to determine imported disk reference."
-  echo "$IMPORT_OUT"
-  exit 1
-}
-msg_ok "Imported disk (${CL}${BL}${DISK_REF_IMPORTED}${CL})"
-
+pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
+qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \
-  -efidisk0 ${STORAGE}:0,efitype=4m \
-  -scsi0 ${DISK_REF_IMPORTED},${DISK_CACHE}${THIN%,} \
+  -efidisk0 ${DISK0_REF}${FORMAT} \
+  -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=${DISK_SIZE} \
  -ide2 ${STORAGE}:cloudinit \
  -boot order=scsi0 \
  -serial0 socket >/dev/null
--- a/vm/debian-13-vm.sh
+++ b/vm/debian-13-vm.sh
@@ -70,7 +70,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -201,17 +201,6 @@ function exit-script() {
  exit
 }

-function select_cloud_init() {
-  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "CLOUD-INIT" \
-    --yesno "Enable Cloud-Init for VM configuration?\n\nCloud-Init allows automatic configuration of:\n- User accounts and passwords\n- SSH keys\n- Network settings (DHCP/Static)\n- DNS configuration\n\nYou can also configure these settings later in Proxmox UI.\n\nNote: Without Cloud-Init, the nocloud image will be used with console auto-login." --defaultno 18 68); then
-    CLOUD_INIT="yes"
-    echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}yes${CL}"
-  else
-    CLOUD_INIT="no"
-    echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}no${CL}"
-  fi
-}
-
 function default_settings() {
  VMID=$(get_valid_nextid)
  FORMAT=",efitype=4m"
@@ -227,6 +216,7 @@ function default_settings() {
  VLAN=""
  MTU=""
  START_VM="yes"
+  CLOUD_INIT="no"
  METHOD="default"
  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx${CL}"
@@ -240,7 +230,7 @@ function default_settings() {
  echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}${MAC}${CL}"
  echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}Default${CL}"
  echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}Default${CL}"
-  select_cloud_init
+  echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}no${CL}"
  echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
  echo -e "${CREATING}${BOLD}${DGN}Creating a Debian 13 VM using the above default settings${CL}"
 }
@@ -410,7 +400,13 @@ function advanced_settings() {
    exit-script
  fi

-  select_cloud_init
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "CLOUD-INIT" --yesno "Configure the VM with Cloud-init?" --defaultno 10 58); then
+    echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}yes${CL}"
+    CLOUD_INIT="yes"
+  else
+    echo -e "${CLOUD}${BOLD}${DGN}Configure Cloud-init: ${BGN}no${CL}"
+    CLOUD_INIT="no"
+  fi

  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "START VIRTUAL MACHINE" --yesno "Start VM when completed?" 10 58); then
    echo -e "${GATEWAY}${BOLD}${DGN}Start VM when completed: ${BGN}yes${CL}"
@@ -477,17 +473,6 @@ else
 fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
-
-# ==============================================================================
-# PREREQUISITES
-# ==============================================================================
-if ! command -v virt-customize &>/dev/null; then
-  msg_info "Installing libguestfs-tools"
-  apt-get update >/dev/null 2>&1
-  apt-get install -y libguestfs-tools >/dev/null 2>&1
-  msg_ok "Installed libguestfs-tools"
-fi
-
 msg_info "Retrieving the URL for the Debian 13 Qcow2 Disk Image"
 if [ "$CLOUD_INIT" == "yes" ]; then
  URL=https://cloud.debian.org/images/cloud/trixie/latest/debian-13-genericcloud-amd64.qcow2
@@ -501,50 +486,6 @@ echo -en "\e[1A\e[0K"
 FILE=$(basename $URL)
 msg_ok "Downloaded ${CL}${BL}${FILE}${CL}"

-# ==============================================================================
-# IMAGE CUSTOMIZATION
-# ==============================================================================
-msg_info "Customizing ${FILE} image"
-
-WORK_FILE=$(mktemp --suffix=.qcow2)
-cp "$FILE" "$WORK_FILE"
-
-# Set hostname
-virt-customize -q -a "$WORK_FILE" --hostname "${HN}" >/dev/null 2>&1
-
-# Prepare for unique machine-id on first boot
-virt-customize -q -a "$WORK_FILE" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1
-virt-customize -q -a "$WORK_FILE" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1
-
-# Disable systemd-firstboot to prevent interactive prompts blocking the console
-virt-customize -q -a "$WORK_FILE" --run-command "systemctl disable systemd-firstboot.service 2>/dev/null; rm -f /etc/systemd/system/sysinit.target.wants/systemd-firstboot.service; ln -sf /dev/null /etc/systemd/system/systemd-firstboot.service" >/dev/null 2>&1 || true
-
-# Pre-seed firstboot settings so it won't prompt even if triggered
-virt-customize -q -a "$WORK_FILE" --run-command "echo 'Etc/UTC' > /etc/timezone && ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime" >/dev/null 2>&1 || true
-virt-customize -q -a "$WORK_FILE" --run-command "touch /etc/locale.conf" >/dev/null 2>&1 || true
-
-if [ "$CLOUD_INIT" == "yes" ]; then
-  # Cloud-Init handles SSH and login
-  virt-customize -q -a "$WORK_FILE" --run-command "sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
-  virt-customize -q -a "$WORK_FILE" --run-command "sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config" >/dev/null 2>&1 || true
-else
-  # Configure auto-login on serial console (ttyS0) and virtual console (tty1)
-  virt-customize -q -a "$WORK_FILE" --run-command "mkdir -p /etc/systemd/system/serial-getty@ttyS0.service.d" >/dev/null 2>&1 || true
-  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/systemd/system/serial-getty@ttyS0.service.d/autologin.conf << EOF
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear %I \$TERM
-EOF' >/dev/null 2>&1 || true
-  virt-customize -q -a "$WORK_FILE" --run-command "mkdir -p /etc/systemd/system/getty@tty1.service.d" >/dev/null 2>&1 || true
-  virt-customize -q -a "$WORK_FILE" --run-command 'cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --noclear %I \$TERM
-EOF' >/dev/null 2>&1 || true
-fi
-
-msg_ok "Customized image"
-
 STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
 case $STORAGE_TYPE in
 nfs | dir)
@@ -560,11 +501,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
@@ -576,7 +512,7 @@ msg_info "Creating a Debian 13 VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
-qm importdisk $VMID ${WORK_FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
+qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 if [ "$CLOUD_INIT" == "yes" ]; then
  qm set $VMID \
    -efidisk0 ${DISK0_REF}${FORMAT} \
@@ -591,10 +527,6 @@ else
    -boot order=scsi0 \
    -serial0 socket >/dev/null
 fi
-
-# Clean up work file
-rm -f "$WORK_FILE"
-
 DESCRIPTION=$(
  cat <<EOF
 <div align='center'>
--- a/vm/debian-vm.sh
+++ b/vm/debian-vm.sh
@@ -70,7 +70,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -501,11 +501,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/docker-vm.sh
+++ b/vm/docker-vm.sh
@@ -45,7 +45,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
--- a/vm/haos-vm.sh
+++ b/vm/haos-vm.sh
@@ -74,7 +74,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
--- a/vm/mikrotik-routeros.sh
+++ b/vm/mikrotik-routeros.sh
@@ -71,7 +71,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -566,11 +566,6 @@ zfspool)
  DISK_REF=""
  DISK_IMPORT="-format raw"
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac

 DISK_VAR="vm-${VMID}-disk-0${DISK_EXT:-}"
--- a/vm/nextcloud-vm.sh
+++ b/vm/nextcloud-vm.sh
@@ -70,7 +70,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -487,11 +487,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1,2}; do
  disk="DISK$i"
--- a/vm/openwrt-vm.sh
+++ b/vm/openwrt-vm.sh
@@ -74,7 +74,7 @@ function error_handler() {
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
-  post_update_to_api "failed" "$exit_code"
+  post_update_to_api "failed" "$command"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
  echo -e "\n$error_message\n"
  cleanup_vmid
--- a/vm/opnsense-vm.sh
+++ b/vm/opnsense-vm.sh
@@ -48,7 +48,7 @@ function error_handler() {
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
-  post_update_to_api "failed" "$exit_code"
+  post_update_to_api "failed" "$command"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
  echo -e "\n$error_message\n"
  cleanup_vmid
@@ -619,11 +619,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/owncloud-vm.sh
+++ b/vm/owncloud-vm.sh
@@ -71,7 +71,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -500,11 +500,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1,2}; do
  disk="DISK$i"
--- a/vm/pimox-haos-vm.sh
+++ b/vm/pimox-haos-vm.sh
@@ -79,7 +79,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }
@@ -402,11 +402,6 @@ nfs | dir)
  DISK_REF="$VMID/"
  DISK_IMPORT="-format qcow2"
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/ubuntu2204-vm.sh
+++ b/vm/ubuntu2204-vm.sh
@@ -66,7 +66,7 @@ function error_handler() {
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
-  post_update_to_api "failed" "$exit_code"
+  post_update_to_api "failed" "$command"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
  echo -e "\n$error_message\n"
  cleanup_vmid
@@ -482,11 +482,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/ubuntu2404-vm.sh
+++ b/vm/ubuntu2404-vm.sh
@@ -69,7 +69,7 @@ function error_handler() {
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
-  post_update_to_api "failed" "$exit_code"
+  post_update_to_api "failed" "$command"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
  echo -e "\n$error_message\n"
  cleanup_vmid
@@ -484,11 +484,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/ubuntu2504-vm.sh
+++ b/vm/ubuntu2504-vm.sh
@@ -68,7 +68,7 @@ function error_handler() {
  local exit_code="$?"
  local line_number="$1"
  local command="$2"
-  post_update_to_api "failed" "$exit_code"
+  post_update_to_api "failed" "$command"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
  echo -e "\n$error_message\n"
  cleanup_vmid
@@ -483,11 +483,6 @@ btrfs)
  FORMAT=",efitype=4m"
  THIN=""
  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
 esac
 for i in {0,1}; do
  disk="DISK$i"
--- a/vm/umbrel-os-vm.sh
+++ b/vm/umbrel-os-vm.sh
@@ -69,7 +69,7 @@ function error_handler() {
  local line_number="$1"
  local command="$2"
  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
-  post_update_to_api "failed" "${exit_code}"
+  post_update_to_api "failed" "${command}"
  echo -e "\n$error_message\n"
  cleanup_vmid
 }