misc scripts: add support for arm64

This commit is contained in:
Sam Heinz
2026-03-07 15:44:44 +10:00
parent 5c2cf61455
commit 087f817bf6
4 changed files with 339 additions and 222 deletions
+130 -15
View File
@@ -3425,6 +3425,9 @@ start() {
set_std_mode set_std_mode
ensure_profile_loaded ensure_profile_loaded
get_lxc_ip 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_script
update_motd_ip update_motd_ip
cleanup_lxc cleanup_lxc
@@ -3453,6 +3456,9 @@ start() {
esac esac
ensure_profile_loaded ensure_profile_loaded
get_lxc_ip 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_script
update_motd_ip update_motd_ip
cleanup_lxc cleanup_lxc
@@ -4096,7 +4102,16 @@ EOF'
# that sends "configuring" status AFTER the host already reported "failed" # that sends "configuring" status AFTER the host already reported "failed"
export CONTAINER_INSTALLING=true 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=$? local lxc_exit=$?
unset CONTAINER_INSTALLING unset CONTAINER_INSTALLING
@@ -4474,7 +4489,16 @@ EOF'
# Re-run install script in existing container (don't destroy/recreate) # Re-run install script in existing container (don't destroy/recreate)
set +Eeuo pipefail set +Eeuo pipefail
trap - ERR 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=$? local apt_retry_exit=$?
set -Eeuo pipefail set -Eeuo pipefail
trap 'error_handler' ERR trap 'error_handler' ERR
@@ -4993,6 +5017,64 @@ create_lxc_container() {
esac 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
11 | 11.*) echo "bullseye" ;; 12 | 12.*) echo "bookworm" ;;
13 | 13.*) echo "trixie" ;; *) echo "trixie" ;;
esac ;;
alpine) echo "3.22" ;;
ubuntu)
case "$2" in
20.04* | focal) echo "focal" ;; 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 asylumexp/debian-ifupdown2-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/asylumexp/debian-ifupdown2-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 # Required input variables
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -5129,6 +5211,40 @@ create_lxc_container() {
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Template discovery & validation # 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:-}" TEMPLATE_SEARCH="${PCT_OSTYPE}-${PCT_OSVERSION:-}"
case "$PCT_OSTYPE" in case "$PCT_OSTYPE" in
debian | ubuntu) TEMPLATE_PATTERN="-standard_" ;; debian | ubuntu) TEMPLATE_PATTERN="-standard_" ;;
@@ -5387,6 +5503,7 @@ create_lxc_container() {
msg_error "Template $TEMPLATE not available in storage $TEMPLATE_STORAGE after download." msg_error "Template $TEMPLATE not available in storage $TEMPLATE_STORAGE after download."
exit 223 exit 223
fi fi
fi
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Dynamic preflight for Debian 13.x: offer upgrade if available (no hard mins) # Dynamic preflight for Debian 13.x: offer upgrade if available (no hard mins)
@@ -5464,19 +5581,13 @@ create_lxc_container() {
if [[ ! -s "$TEMPLATE_PATH" || "$(stat -c%s "$TEMPLATE_PATH" 2>/dev/null || echo 0)" -lt 1000000 ]]; then 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" msg_info "Template file missing or too small downloading"
rm -f "$TEMPLATE_PATH" 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" msg_ok "Template downloaded"
elif ! tar -tf "$TEMPLATE_PATH" &>/dev/null; then 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" msg_info "Template appears corrupted re-downloading"
rm -f "$TEMPLATE_PATH" 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" msg_ok "Template re-downloaded"
else else
msg_warn "Template appears corrupted, but no online version exists. Skipping re-download." msg_warn "Template appears corrupted, but no online version exists. Skipping re-download."
@@ -5497,7 +5608,7 @@ create_lxc_container() {
if grep -qiE 'unable to open|corrupt|invalid' "$LOGFILE"; then if grep -qiE 'unable to open|corrupt|invalid' "$LOGFILE"; then
msg_info "Template may be corrupted re-downloading" msg_info "Template may be corrupted re-downloading"
rm -f "$TEMPLATE_PATH" rm -f "$TEMPLATE_PATH"
pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1 download_template
msg_ok "Template re-downloaded" msg_ok "Template re-downloaded"
fi fi
@@ -5510,7 +5621,11 @@ create_lxc_container() {
if [[ ! -f "$LOCAL_TEMPLATE_PATH" ]]; then if [[ ! -f "$LOCAL_TEMPLATE_PATH" ]]; then
msg_ok "Trying local storage fallback" msg_ok "Trying local storage fallback"
msg_info "Downloading template to local" 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 pveam download local "$TEMPLATE" >>"${BUILD_LOG:-/dev/null}" 2>&1
fi
msg_ok "Template downloaded to local" msg_ok "Template downloaded to local"
else else
msg_ok "Trying local storage fallback" msg_ok "Trying local storage fallback"
@@ -5646,15 +5761,15 @@ description() {
<span style='margin: 0 10px;'> <span style='margin: 0 10px;'>
<i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i> <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
<a href='https://github.com/community-scripts/ProxmoxVE' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a> <a href='https://github.com/community-scripts/ProxmoxVED' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
</span> </span>
<span style='margin: 0 10px;'> <span style='margin: 0 10px;'>
<i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i> <i class="fa fa-comments fa-fw" style="color: #f5f5f5;"></i>
<a href='https://github.com/community-scripts/ProxmoxVE/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a> <a href='https://github.com/community-scripts/ProxmoxVED/discussions' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Discussions</a>
</span> </span>
<span style='margin: 0 10px;'> <span style='margin: 0 10px;'>
<i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i> <i class="fa fa-exclamation-circle fa-fw" style="color: #f5f5f5;"></i>
<a href='https://github.com/community-scripts/ProxmoxVE/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a> <a href='https://github.com/community-scripts/ProxmoxVED/issues' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Issues</a>
</span> </span>
</div> </div>
EOF EOF
+4 -3
View File
@@ -344,9 +344,10 @@ pve_check() {
# - Provides link to ARM64-compatible scripts # - Provides link to ARM64-compatible scripts
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
arch_check() { 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 sleep 2
exit 106 exit 106
fi fi
+1
View File
@@ -235,6 +235,7 @@ EOF
fi fi
apt_update_safe apt_update_safe
$STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade $STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade
$STD apt-get install -y sudo curl mc gnupg2 openssh-server wget gcc
rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
msg_ok "Updated Container OS" msg_ok "Updated Container OS"
post_progress_to_api post_progress_to_api
+1 -1
View File
@@ -3267,7 +3267,7 @@ function fetch_and_deploy_gh_release() {
fi fi
if [[ -z "$url_match" ]]; then if [[ -z "$url_match" ]]; then
for u in $assets; do for u in $assets; do
if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then if [[ "$u" =~ ($arch|aarch64|arm64).*\.deb$ ]]; then
url_match="$u" url_match="$u"
break break
fi fi