Konstantin/ProxmoxVED
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: ensure both install scripts are in same bash process

Browse Source
This commit is contained in:
Sam Heinz
2026-03-07 14:57:26 +10:00
parent e515b844c3
commit 26054d7c1b
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
misc/build.func
View File

@@ -4102,10 +4102,16 @@ EOF'
# that sends "configuring" status AFTER the host already reported "failed"
export CONTAINER_INSTALLING=true
local _install_script
_install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/${var_install}.sh")"
if [[ "$ARCH" == "arm64" ]]; then
lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/arm/${var_install}.sh)"
local _arm_script
_arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/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 "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/${var_install}.sh)"
lxc-attach -n "$CTID" -- bash -c "$_install_script"
local lxc_exit=$?
unset CONTAINER_INSTALLING
@@ -4483,10 +4489,16 @@ EOF'
# Re-run install script in existing container (don't destroy/recreate)
set +Eeuo pipefail
trap - ERR
local _install_script
_install_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/${var_install}.sh")"
if [[ "$ARCH" == "arm64" ]]; then
lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/arm/${var_install}.sh)"
local _arm_script
_arm_script="$(curl -fsSL "https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/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 "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/arm64-dev-build/install/${var_install}.sh)"
lxc-attach -n "$CTID" -- bash -c "$_install_script"
local apt_retry_exit=$?
set -Eeuo pipefail
trap 'error_handler' ERR