sabnzbd: stop an optional extra from aborting the update

par2cmdline-turbo is optional - the install asks <y/N> for it - but its update ran first, unguarded, under catch_errors. When the release lookup failed the ERR trap took the whole run down and SABnzbd itself was never updated: No matching release found for animetosho/par2cmdline-turbo in line 2085: exit code 250 The asset it asks for exists and the release query resolves v1.5.0 against live data, so that lookup failed transiently. Whatever the reason, an optional component must not be able to block the main update. Move it behind the installation check so a missing /opt/sabnzbd is reported first, and warn instead of aborting when the lookup fails. The installed par2 binary simply stays as it is.
2026-09-18 18:54:03 +00:00 · 2026-09-18 08:09:40 +02:00
19 changed files with 74 additions and 356 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -543,34 +543,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 </details>

-## 2026-09-18
-
-### 🆕 New Scripts
-
-  - Almalinux-VM ([#17349](https://github.com/community-scripts/ProxmoxVE/pull/17349))
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - alpine-vm: ask for the Cloud-Init credentials [@MickLesk](https://github.com/MickLesk) ([#17355](https://github.com/community-scripts/ProxmoxVE/pull/17355))
-    - suggestarr: keep the data where the app actually reads it [@MickLesk](https://github.com/MickLesk) ([#17317](https://github.com/community-scripts/ProxmoxVE/pull/17317))
-    - immichframe: set the admin password the new admin UI requires [@MickLesk](https://github.com/MickLesk) ([#17315](https://github.com/community-scripts/ProxmoxVE/pull/17315))
-
-  - #### ✨ New Features
-
-    - pangolin: Bump to 1.23.0 [@MickLesk](https://github.com/MickLesk) ([#17343](https://github.com/community-scripts/ProxmoxVE/pull/17343))
-
-  - #### 🔧 Refactor
-
-    - Refactor: Oxicloud [@MickLesk](https://github.com/MickLesk) ([#17338](https://github.com/community-scripts/ProxmoxVE/pull/17338))
-
-### 💾 Core
-
-  - Stop a modified conffile from aborting the whole update [@MickLesk](https://github.com/MickLesk) ([core#47](https://github.com/community-scripts/core/pull/47))
- Generate app headers [@github-actions[bot]](https://github.com/github-actions[bot]) ([core#46](https://github.com/community-scripts/core/pull/46))
- github api: retry a 200 that is not a usable release payload [@MickLesk](https://github.com/MickLesk) ([core#45](https://github.com/community-scripts/core/pull/45))
-
 ## 2026-09-17

 ### 🆕 New Scripts
--- a/ct/crafty-controller.sh
+++ b/ct/crafty-controller.sh
@@ -46,8 +46,8 @@ function update_script() {

    CLEAN_INSTALL=1 fetch_and_deploy_gl_release "Crafty-Controller" "crafty-controller/crafty-4" "tarball" "latest" "/opt/crafty-controller/crafty/crafty-4"

-    restore_backup
    chown -R crafty:crafty /opt/crafty-controller
+    restore_backup

    msg_info "Updating TemurinJDK"
    setup_java
--- a/ct/databasus.sh
+++ b/ct/databasus.sh
@@ -87,10 +87,10 @@ function update_script() {
    mkdir -p /opt/databasus/ui/build
    cp -r /opt/databasus/frontend/dist/* /opt/databasus/ui/build/
    cp -r /opt/databasus/backend/migrations /opt/databasus/
+    chown -R postgres:postgres /opt/databasus
    msg_ok "Updated Databasus"

    restore_backup
-    chown -R postgres:postgres /opt/databasus

    if ! grep -q "EnvironmentFile=/.env" /etc/systemd/system/databasus.service; then
      msg_info "Updating Service"
--- a/ct/domain-monitor.sh
+++ b/ct/domain-monitor.sh
@@ -53,10 +53,10 @@ function update_script() {
    msg_info "Updating Domain Monitor"
    cd /opt/domain-monitor
    $STD composer install
+    chown -R www-data:www-data /opt/domain-monitor
    msg_ok "Updated Domain Monitor"

    restore_backup
-    chown -R www-data:www-data /opt/domain-monitor

    msg_info "Restarting Services"
    systemctl start apache2
--- a/ct/immichframe.sh
+++ b/ct/immichframe.sh
@@ -79,17 +79,6 @@ function update_script() {
    restore_backup
    chown -R immichframe:immichframe /opt/immichframe

-    if ! grep -q '^Environment=IMMICHFRAME_ADMIN_PASSWORD=' /etc/systemd/system/immichframe.service; then
-      msg_info "Setting Admin Password"
-      ADMIN_PASSWORD=$(openssl rand -hex 16)
-      sed -i "/^Environment=DOTNET_CONTENTROOT=/a Environment=IMMICHFRAME_ADMIN_PASSWORD=${ADMIN_PASSWORD}" /etc/systemd/system/immichframe.service
-      cat <<EOF >>~/immichframe.creds
-ImmichFrame Admin User: admin
-ImmichFrame Admin Password: $ADMIN_PASSWORD
-EOF
-      systemctl daemon-reload
-      msg_ok "Set Admin Password (see ~/immichframe.creds)"
-    fi

    msg_info "Starting Service"
    systemctl start immichframe
--- a/ct/oxicloud.sh
+++ b/ct/oxicloud.sh
@@ -10,8 +10,8 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_

 APP="OxiCloud"
 var_tags="${var_tags:-files;documents}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-2048}"
+var_cpu="${var_cpu:-4}"
+var_ram="${var_ram:-6144}"
 var_disk="${var_disk:-20}"
 var_os="${var_os:-debian}"
 var_version="${var_version:-13}"
@@ -33,19 +33,42 @@ function update_script() {
    exit
  fi

-  ensure_dependencies ffmpeg
+  NODE_VERSION="26" setup_nodejs

  if check_for_gh_release "OxiCloud" "DioCrafts/OxiCloud"; then
    msg_info "Stopping OxiCloud"
    systemctl stop oxicloud
    msg_ok "Stopped OxiCloud"

-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "OxiCloud" "DioCrafts/OxiCloud" "prebuild" "latest" "/opt/oxicloud" "oxicloud-*-$(arch_resolve x86_64 aarch64)-unknown-linux-musl.tar.gz"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "OxiCloud" "DioCrafts/OxiCloud" "tarball" "latest" "/opt/oxicloud"
+    TOOLCHAIN="$(grep -oP 'FROM\s+rust:\K[0-9]+\.[0-9]+(\.[0-9]+)?' /opt/oxicloud/Dockerfile | head -1)"
+    RUST_TOOLCHAIN="${TOOLCHAIN:-stable}" setup_rust

-    msg_info "Updating OxiCloud"
-    install -m 755 /opt/oxicloud/oxicloud /usr/local/bin/oxicloud
-    rm -f /usr/local/bin/migrate-nfc-filenames /usr/bin/oxicloud
-    sed -i 's|^OXICLOUD_STATIC_PATH=|#OXICLOUD_STATIC_PATH=|' /etc/oxicloud/.env
+    msg_info "Building Frontend SPA"
+    cd /opt/oxicloud/frontend
+    $STD npm ci
+    $STD npm run build
+    msg_ok "Built Frontend SPA"
+
+    msg_info "Updating OxiCloud (Patience)"
+    set -a
+    source /etc/oxicloud/.env
+    set +a
+    cd /opt/oxicloud
+    export DATABASE_URL
+    export RUSTFLAGS="-C target-cpu=native"
+    RAM_MB=$(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)
+    CARGO_JOBS=$((RAM_MB / 2560))
+    [[ $CARGO_JOBS -lt 1 ]] && CARGO_JOBS=1
+    [[ $CARGO_JOBS -gt $(nproc) ]] && CARGO_JOBS=$(nproc)
+    $STD cargo build --release -j "$CARGO_JOBS" --bin oxicloud --bin migrate-nfc-filenames
+    mv target/release/oxicloud /usr/local/bin/oxicloud
+    mv target/release/migrate-nfc-filenames /usr/local/bin/migrate-nfc-filenames
+    chmod +x /usr/local/bin/oxicloud /usr/local/bin/migrate-nfc-filenames
+    rm -f /usr/bin/oxicloud
+    rm -rf /opt/oxicloud/static
+    mv /opt/oxicloud/static-dist /opt/oxicloud/static
+    rm -rf /opt/oxicloud/target /opt/oxicloud/frontend/node_modules
    msg_ok "Updated OxiCloud"

    msg_info "Starting OxiCloud"
--- a/ct/pangolin.sh
+++ b/ct/pangolin.sh
@@ -8,7 +8,7 @@ source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_
 # Source: https://pangolin.net/ | Github: https://github.com/fosrl/pangolin

 APP="Pangolin"
-PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.23.0}"
+PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.21.0}"
 var_tags="${var_tags:-proxy}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-4096}"
--- a/ct/poznote.sh
+++ b/ct/poznote.sh
@@ -44,10 +44,10 @@ function update_script() {

    msg_info "Deploying New Version"
    cp -r /opt/poznote/src/. /var/www/html/
+    chown -R www-data:www-data /var/www/html
    msg_ok "Deployed New Version"

    restore_backup
-    chown -R www-data:www-data /var/www/html

    msg_info "Running Poznote Initialization"
    POZNOTE_INIT=/opt/poznote/docker/init.sh
--- a/ct/sabnzbd.sh
+++ b/ct/sabnzbd.sh
@@ -27,14 +27,16 @@ function update_script() {
    check_container_storage
    check_container_resources

-    if par2 --version | grep -q "par2cmdline-turbo"; then
-        fetch_and_deploy_gh_release "par2cmdline-turbo" "animetosho/par2cmdline-turbo" "prebuild" "latest" "/usr/bin/" "*-linux-$(arch_resolve).zip"
-    fi
-
    if [[ ! -d /opt/sabnzbd ]]; then
        msg_error "No ${APP} Installation Found!"
        exit
    fi
+
+    if par2 --version 2>/dev/null | grep -q "par2cmdline-turbo"; then
+        if ! fetch_and_deploy_gh_release "par2cmdline-turbo" "animetosho/par2cmdline-turbo" "prebuild" "latest" "/usr/bin/" "*-linux-$(arch_resolve).zip"; then
+            msg_warn "Could not update par2cmdline-turbo, keeping the installed version"
+        fi
+    fi
    if check_for_gh_release "sabnzbd-org" "sabnzbd/sabnzbd"; then
        PYTHON_VERSION="3.13" setup_uv
        systemctl stop sabnzbd
--- a/ct/suggestarr.sh
+++ b/ct/suggestarr.sh
@@ -37,19 +37,8 @@ function update_script() {
    systemctl stop suggestarr
    msg_ok "Stopped Service"

-    mkdir -p /opt/suggestarr_data
-    if [[ -d /opt/suggestarr/config/config_files && ! -L /opt/suggestarr/config/config_files ]]; then
-      msg_info "Migrating Configuration"
-      cp -an /opt/suggestarr/config/config_files/. /opt/suggestarr_data/
-      msg_ok "Migrated Configuration to /opt/suggestarr_data"
-    fi
-
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "suggestarr" "giuseppe99barchetta/SuggestArr" "tarball"

-    mkdir -p /opt/suggestarr/config
-    rm -rf /opt/suggestarr/config/config_files
-    ln -sfn /opt/suggestarr_data /opt/suggestarr/config/config_files
-
    msg_info "Building Frontend"
    cd /opt/suggestarr/client
    $STD npm install
--- a/install/immichframe-install.sh
+++ b/install/immichframe-install.sh
@@ -60,11 +60,6 @@ chown -R immichframe:immichframe /opt/immichframe
 msg_ok "Setup ImmichFrame"

 msg_info "Creating Service"
-ADMIN_PASSWORD=$(openssl rand -hex 16)
-cat <<EOF >~/immichframe.creds
-ImmichFrame Admin User: admin
-ImmichFrame Admin Password: $ADMIN_PASSWORD
-EOF
 cat <<EOF >/etc/systemd/system/immichframe.service
 [Unit]
 Description=ImmichFrame Digital Photo Frame
@@ -79,7 +74,6 @@ ExecStart=/usr/bin/dotnet /opt/immichframe/ImmichFrame.WebApi.dll
 Environment=ASPNETCORE_URLS=http://0.0.0.0:8080
 Environment=ASPNETCORE_ENVIRONMENT=Production
 Environment=DOTNET_CONTENTROOT=/opt/immichframe
-Environment=IMMICHFRAME_ADMIN_PASSWORD=$ADMIN_PASSWORD
 Restart=always
 RestartSec=5
 StandardOutput=journal
--- a/install/oxicloud-install.sh
+++ b/install/oxicloud-install.sh
@@ -14,20 +14,43 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt install -y ffmpeg
+$STD apt install -y build-essential
 msg_ok "Installed Dependencies"

+NODE_VERSION="26" setup_nodejs
 PG_VERSION="17" setup_postgresql
 PG_DB_NAME="oxicloud" PG_DB_USER="oxicloud" setup_postgresql_db
-fetch_and_deploy_gh_release "OxiCloud" "DioCrafts/OxiCloud" "prebuild" "latest" "/opt/oxicloud" "oxicloud-*-$(arch_resolve x86_64 aarch64)-unknown-linux-musl.tar.gz"
-install -m 755 /opt/oxicloud/oxicloud /usr/local/bin/oxicloud
+fetch_and_deploy_gh_release "OxiCloud" "DioCrafts/OxiCloud" "tarball" "latest" "/opt/oxicloud"
+TOOLCHAIN="$(grep -oP 'FROM\s+rust:\K[0-9]+\.[0-9]+(\.[0-9]+)?' /opt/oxicloud/Dockerfile | head -1)"
+RUST_TOOLCHAIN="${TOOLCHAIN:-stable}" setup_rust
+
+msg_info "Building Frontend SPA"
+cd /opt/oxicloud/frontend
+$STD npm ci
+$STD npm run build
+msg_ok "Built Frontend SPA"
+
+msg_info "Building OxiCloud (Patience)"
+cd /opt/oxicloud
+export DATABASE_URL="postgres://${PG_DB_USER}:${PG_DB_PASS}@localhost/${PG_DB_NAME}"
+export RUSTFLAGS="-C target-cpu=native"
+RAM_MB=$(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)
+CARGO_JOBS=$((RAM_MB / 2560))
+[[ $CARGO_JOBS -lt 1 ]] && CARGO_JOBS=1
+[[ $CARGO_JOBS -gt $(nproc) ]] && CARGO_JOBS=$(nproc)
+$STD cargo build --release -j "$CARGO_JOBS" --bin oxicloud --bin migrate-nfc-filenames
+mv target/release/oxicloud /usr/local/bin/oxicloud
+mv target/release/migrate-nfc-filenames /usr/local/bin/migrate-nfc-filenames
+rm -rf /opt/oxicloud/static
+mv /opt/oxicloud/static-dist /opt/oxicloud/static
+rm -rf /opt/oxicloud/target /opt/oxicloud/frontend/node_modules
+msg_ok "Built OxiCloud"

 msg_info "Configuring OxiCloud"
 mkdir -p {/mnt/oxicloud,/etc/oxicloud}
-DATABASE_URL="postgres://${PG_DB_USER}:${PG_DB_PASS}@localhost/${PG_DB_NAME}"
 sed -e 's|OXICLOUD_STORAGE_PATH=.*|OXICLOUD_STORAGE_PATH=/mnt/oxicloud|' \
  -e 's|OXICLOUD_SERVER_HOST=.*|OXICLOUD_SERVER_HOST=0.0.0.0|' \
-  -e 's|^OXICLOUD_STATIC_PATH=|#OXICLOUD_STATIC_PATH=|' \
+  -e 's|OXICLOUD_STATIC_PATH=.*|OXICLOUD_STATIC_PATH=/opt/oxicloud/static|' \
  -e "s|^#OXICLOUD_BASE_URL=.*|OXICLOUD_BASE_URL=http://${LOCAL_IP}:8086|" \
  -e "s|OXICLOUD_DB_CONNECTION_STRING=.*|OXICLOUD_DB_CONNECTION_STRING=${DATABASE_URL}|" \
  -e "s|^DATABASE_URL=.*|DATABASE_URL=${DATABASE_URL}|" \
--- a/install/pangolin-install.sh
+++ b/install/pangolin-install.sh
@@ -22,7 +22,7 @@ msg_ok "Installed Dependencies"
 NODE_VERSION="24" setup_nodejs
 PG_VERSION="17" setup_postgresql
 PG_DB_NAME="pangolin" PG_DB_USER="pangolin" setup_postgresql_db
-PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.23.0}"
+PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.21.0}"
 fetch_and_deploy_gh_release "pangolin" "fosrl/pangolin" "tarball" "$PANGOLIN_VERSION"
 fetch_and_deploy_gh_release "gerbil" "fosrl/gerbil" "singlefile" "latest" "/usr/bin" "gerbil_linux_$(arch_resolve)"
 fetch_and_deploy_gh_release "traefik" "traefik/traefik" "prebuild" "latest" "/usr/bin" "traefik_v*_linux_$(arch_resolve).tar.gz"
--- a/install/suggestarr-install.sh
+++ b/install/suggestarr-install.sh
@@ -38,9 +38,7 @@ $STD uv pip install --python /opt/suggestarr/.venv -r /opt/suggestarr/api_servic
 msg_ok "Set up Python Environment"

 msg_info "Configuring SuggestArr"
-mkdir -p /opt/suggestarr_data /opt/suggestarr/config
-rm -rf /opt/suggestarr/config/config_files
-ln -sfn /opt/suggestarr_data /opt/suggestarr/config/config_files
+mkdir -p /opt/suggestarr_data
 cat <<EOF >/opt/suggestarr.env
 SUGGESTARR_PORT=5000
 LOG_LEVEL=info
--- a/vm/almalinux-vm.sh
+++ b/vm/almalinux-vm.sh
@@ -1,239 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Agent-Fennec
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-
-COMMUNITY_SCRIPTS_URL="${COMMUNITY_SCRIPTS_URL:-https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main}"
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func")
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/pve/vm-core.func")
-source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/vm/cloud-init.func") || true
-load_functions
-
-APP="AlmaLinux"
-APP_TYPE="vm"
-NSAPP="almalinux-vm"
-var_os="almalinux"
-var_version="10"
-
-GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
-RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
-METHOD=""
-THIN="discard=on,ssd=1,"
-
-set -e
-trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
-trap cleanup EXIT
-trap 'post_update_to_api "failed" "INTERRUPTED"' SIGINT
-trap 'post_update_to_api "failed" "TERMINATED"' SIGTERM
-
-function error_handler() {
-  local exit_code="$?"
-  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" "${command}"
-  echo -e "\n$error_message\n"
-  cleanup_vmid
-}
-
-TEMP_DIR=$(mktemp -d)
-pushd "$TEMP_DIR" >/dev/null
-
-if [[ "${VM_UNATTENDED:-0}" == "1" ]]; then
-  var_version="${VM_OS_VERSION:-$var_version}"
-elif vm_dialog radiolist "ALMALINUX VERSION" "Choose the AlmaLinux release to install" --cancel-button Exit-Script 12 58 3 \
-  "10" "AlmaLinux 10 (Purple Lion)" ON \
-  "9" "AlmaLinux 9 (Seafoam Ocelot)" OFF \
-  "8" "AlmaLinux 8 (Sapphire Caracal)" OFF; then
-  var_version="$VM_DIALOG_RESULT"
-else
-  exit_script
-fi
-
-# glibc aborts with exit 127 when the CPU is below the release baseline, which
-# the kernel then reports as "Attempted to kill init". kvm64 is only v1, so 9
-# and 10 both need a model named here. The baselines are x86-only, so on
-# aarch64 the default model stands.
-case "$var_version" in
-10) ALMA_CPU="$(vm_arch_resolve " -cpu x86-64-v3" "")" ;;
-9) ALMA_CPU="$(vm_arch_resolve " -cpu x86-64-v2-AES" "")" ;;
-8) ALMA_CPU="" ;;
-*)
-  msg_error "Unsupported AlmaLinux version '${var_version}'"
-  exit 1
-  ;;
-esac
-APP="AlmaLinux ${var_version} VM"
-
-# The GenericCloud image sets no password and has no console login, so the only
-# question is which credentials.
-CLOUDINIT_REQUIRED=1
-vm_prompt_cloud_init "almalinux"
-
-function default_settings() {
-  vm_apply_machine_type "q35"
-  VMID=$(get_valid_nextid)
-  DISK_SIZE="10G"
-  DISK_CACHE=""
-  HN="almalinux"
-  CPU_TYPE="$ALMA_CPU"
-  CORE_COUNT="2"
-  RAM_SIZE="2048"
-  BRG="vmbr0"
-  MAC="$GEN_MAC"
-  VLAN=""
-  MTU=""
-  START_VM="yes"
-  METHOD="default"
-  echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}${USE_CLOUD_INIT}${CL}"
-  vm_echo_default_settings
-}
-
-function advanced_settings() {
-  METHOD="advanced"
-  vm_prompt_vmid "${VMID:-$(get_valid_nextid)}"
-  vm_prompt_machine_type "q35"
-  vm_prompt_disk_size "10G"
-  vm_prompt_disk_cache "none"
-  vm_prompt_hostname "almalinux"
-  vm_prompt_cpu_model "kvm64"
-  if [[ -z "${CPU_TYPE:-}" && -n "$ALMA_CPU" ]]; then
-    CPU_TYPE="$ALMA_CPU"
-    msg_warn "AlmaLinux ${var_version} will not boot on kvm64 - keeping ${CPU_TYPE# -cpu }"
-  fi
-  vm_prompt_cpu_cores "2"
-  vm_prompt_ram "2048"
-  vm_prompt_bridge "vmbr0"
-  vm_prompt_mac "$GEN_MAC"
-  vm_prompt_vlan
-  vm_prompt_mtu
-  vm_prompt_verbose "no"
-  vm_prompt_start_vm "yes"
-
-  if vm_confirm_advanced_settings "Ready to create a ${APP}?"; then
-    echo -e "${CREATING}${BOLD}${DGN}Creating a ${APP} using the above advanced settings${CL}"
-  else
-    header_info
-    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-
-
-vm_start_script "Use Default Settings?\n\nDefaults:\n• 2 CPU Cores\n• 2 GB RAM\n• 10 GB Disk\n• Cloud-Init enabled" 14 58
-post_to_api_vm
-
-vm_select_storage "$HN"
-
-# ==============================================================================
-# PREREQUISITES
-# ==============================================================================
-if ! command -v virt-customize &>/dev/null; then
-  msg_info "Installing libguestfs-tools"
-  $STD apt-get update
-  $STD apt-get install -y libguestfs-tools
-  msg_ok "Installed libguestfs-tools"
-fi
-
-msg_info "Retrieving the URL for the ${APP} Qcow2 Disk Image"
-ALMA_ARCH="$(vm_arch_resolve x86_64 aarch64)"
-URL="https://repo.almalinux.org/almalinux/${var_version}/cloud/${ALMA_ARCH}/images/AlmaLinux-${var_version}-GenericCloud-latest.${ALMA_ARCH}.qcow2"
-sleep 2
-msg_ok "${CL}${BL}${URL}${CL}"
-CACHE_FILE="$(vm_image_cache_path "$URL")"
-vm_fetch_image "$URL" "$CACHE_FILE" --cache --min-bytes $((100 * 1024 * 1024)) || exit 115
-FILE="$(basename "$CACHE_FILE")"
-
-# ==============================================================================
-# IMAGE CUSTOMIZATION
-# ==============================================================================
-WORK_FILE=$(mktemp --suffix=.qcow2)
-cp "$CACHE_FILE" "$WORK_FILE"
-popd >/dev/null
-rm -rf "$TEMP_DIR"
-# vm_prepare_cloud_image draws its own spinner, so this one has to start after
-# it -- otherwise the three calls below run with nothing on screen.
-vm_prepare_cloud_image "$WORK_FILE" "$HN" || true
-
-msg_info "Customizing ${FILE} image"
-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
-virt-customize -q -a "$WORK_FILE" --run-command "systemctl enable serial-getty@ttyS0.service" >/dev/null 2>&1 || true
-virt-customize -q -a "$WORK_FILE" --selinux-relabel >/dev/null 2>&1 || true
-msg_ok "Customized image"
-
-STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
-case $STORAGE_TYPE in
-nfs | dir)
-  DISK_EXT=".qcow2"
-  DISK_REF="$VMID/"
-  DISK_IMPORT="-format qcow2"
-  THIN=""
-  ;;
-btrfs)
-  DISK_EXT=".raw"
-  DISK_REF="$VMID/"
-  DISK_IMPORT="-format raw"
-  FORMAT=",efitype=4m"
-  THIN=""
-  ;;
-*)
-  DISK_EXT=""
-  DISK_REF=""
-  DISK_IMPORT="-format raw"
-  ;;
-esac
-for i in {0,1,2}; do
-  disk="DISK$i"
-  eval DISK"${i}"=vm-"${VMID}"-disk-"${i}"${DISK_EXT:-}
-  eval DISK"${i}"_REF="${STORAGE}":"${DISK_REF:-}""${!disk}"
-done
-
-if [[ "$STORAGE_TYPE" != "nfs" && "$STORAGE_TYPE" != "dir" ]]; then
-  msg_info "Converting image to raw format"
-  RAW_FILE=$(mktemp --suffix=.raw)
-  qemu-img convert -f qcow2 -O raw "$WORK_FILE" "$RAW_FILE"
-  rm -f "$WORK_FILE"
-  WORK_FILE="$RAW_FILE"
-  msg_ok "Converted image to raw format"
-fi
-
-msg_info "Creating an ${APP}"
-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
-vm_alloc_efi_disk "$DISK0"
-pvesm alloc "$STORAGE" "$VMID" "$DISK2" 4M 1>&/dev/null
-qm importdisk "$VMID" "${WORK_FILE}" "$STORAGE" ${DISK_IMPORT:-} 1>&/dev/null
-qm set "$VMID" \
-  -efidisk0 "${DISK0_REF}"${FORMAT} \
-  -scsi0 "${DISK1_REF}",${DISK_CACHE}${THIN}size="${DISK_SIZE}" \
-  -tpmstate0 "${DISK2_REF}",version=v2.0 \
-  -boot order=scsi0 \
-  -serial0 socket >/dev/null
-
-rm -f "$WORK_FILE"
-set_description
-msg_ok "Created an ${APP} ${CL}${BL}(${HN})"
-
-vm_resize_disk
-
-vm_provision "$VMID" || true
-
-if [ "$START_VM" == "yes" ]; then
-  msg_info "Starting ${APP}"
-  $STD qm start "$VMID"
-  msg_ok "Started ${APP}"
-fi
-
-post_update_to_api "done" "none"
-
-echo -e "\n${INFO}${BOLD}${GN}${APP} Configuration Summary:${CL}"
-echo -e "${TAB}${DGN}VM ID: ${BGN}${VMID}${CL}"
-echo -e "${TAB}${DGN}Hostname: ${BGN}${HN}${CL}"
-echo -e "${TAB}${DGN}Release: ${BGN}AlmaLinux ${var_version} (${ALMA_ARCH})${CL}"
-if [ -n "${CLOUDINIT_CRED_FILE:-}" ]; then
-  echo -e "${TAB}${DGN}Cloud-Init credentials: ${BGN}${CLOUDINIT_CRED_FILE}${CL}"
-fi
-
-msg_ok "Completed successfully!\n"
-
--- a/vm/alpine-vm.sh
+++ b/vm/alpine-vm.sh
@@ -34,10 +34,6 @@ pushd "$TEMP_DIR" >/dev/null

 vm_preflight

-# The cloud image sets no password, so the only question is which credentials.
-CLOUDINIT_REQUIRED=1
-vm_prompt_cloud_init "alpine"
-
 function default_settings() {
  VMID=$(get_valid_nextid)
  vm_apply_machine_type "q35"
@@ -53,7 +49,7 @@ function default_settings() {
  MTU=""
  START_VM="yes"
  METHOD="default"
-  echo -e "${CLOUD}${BOLD}${DGN}Cloud-Init: ${BGN}${USE_CLOUD_INIT}${CL}"
+  USE_CLOUD_INIT="yes"
  vm_echo_default_settings
 }

@@ -71,6 +67,7 @@ function advanced_settings() {
  vm_prompt_mac "$GEN_MAC"
  vm_prompt_vlan
  vm_prompt_mtu
+  vm_prompt_cloud_init "alpine"
  vm_prompt_verbose "no"
  vm_prompt_start_vm "yes"

--- a/vm/headers/almalinux
+++ b/vm/headers/almalinux
@@ -1,12 +0,0 @@
-    ___    __                __    _                 
-   /   |  / /___ ___  ____ _/ /   (_)___  __  ___  __
-  / /| | / / __ `__ \/ __ `/ /   / / __ \/ / / / |/_/
- / ___ |/ / / / / / / /_/ / /___/ / / / / /_/ />  <  
-/_/  |_/_/_/ /_/ /_/\__,_/_____/_/_/ /_/\__,_/_/|_|  
-                                                     
-    ___    __                __    _                      __   __                                      _             _      _    ____  ___
-   /   |  / /___ ___  ____ _/ /   (_)___  __  ___  __   _/ / _/_/   ______ _______   _____  __________(_)___  ____  | |    | |  / /  |/  /
-  / /| | / / __ `__ \/ __ `/ /   / / __ \/ / / / |/_/  / __//_/| | / / __ `/ ___/ | / / _ \/ ___/ ___/ / __ \/ __ \ / /    | | / / /|_/ / 
- / ___ |/ / / / / / / /_/ / /___/ / / / / /_/ />  <   (_  < <  | |/ / /_/ / /   | |/ /  __/ /  (__  ) / /_/ / / / /_>_>    | |/ / /  / /  
-/_/  |_/_/_/ /_/ /_/\__,_/_____/_/_/ /_/\__,_/_/|_|  /  _// /  |___/\__,_/_/____|___/\___/_/  /____/_/\____/_/ /_//_/      |___/_/  /_/   
-                                                     /_/  \_\             /_____/                               /_/                       
--- a/vm/headers/alpine
+++ b/vm/headers/alpine
@@ -1,6 +0,0 @@
-    ___    __      _          
-   /   |  / /___  (_)___  ___ 
-  / /| | / / __ \/ / __ \/ _ \
- / ___ |/ / /_/ / / / / /  __/
-/_/  |_/_/ .___/_/_/ /_/\___/ 
-        /_/                   
--- a/vm/headers/debian
+++ b/vm/headers/debian
@@ -1,12 +0,0 @@
-    ____       __    _           
-   / __ \___  / /_  (_)___ _____ 
-  / / / / _ \/ __ \/ / __ `/ __ \
- / /_/ /  __/ /_/ / / /_/ / / / /
-/_____/\___/_.___/_/\__,_/_/ /_/ 
-                                 
-    ____       __    _                 __   __                                      _             _ 
-   / __ \___  / /_  (_)___ _____     _/ / _/_/   ______ _______   _____  __________(_)___  ____  | |
-  / / / / _ \/ __ \/ / __ `/ __ \   / __//_/| | / / __ `/ ___/ | / / _ \/ ___/ ___/ / __ \/ __ \ / /
- / /_/ /  __/ /_/ / / /_/ / / / /  (_  < <  | |/ / /_/ / /   | |/ /  __/ /  (__  ) / /_/ / / / /_>_>
-/_____/\___/_.___/_/\__,_/_/ /_/  /  _// /  |___/\__,_/_/____|___/\___/_/  /____/_/\____/_/ /_//_/  
-                                  /_/  \_\             /_____/                               /_/