This commit is contained in:
CanbiZ (MickLesk)
2026-03-03 13:30:25 +01:00
parent cb648eec9c
commit ed0e6ed49c
2 changed files with 20 additions and 23 deletions

View File

@@ -1405,13 +1405,16 @@ post_update_to_api_extended() {
failed) failed)
pb_status="failed" pb_status="failed"
;; ;;
aborted)
pb_status="aborted"
;;
*) *)
pb_status="unknown" pb_status="unknown"
;; ;;
esac esac
# For failed/unknown status, resolve exit code and error description # For failed/aborted/unknown status, resolve exit code and error description
if [[ "$pb_status" == "failed" ]] || [[ "$pb_status" == "unknown" ]]; then if [[ "$pb_status" == "failed" ]] || [[ "$pb_status" == "aborted" ]] || [[ "$pb_status" == "unknown" ]]; then
if [[ "$raw_exit_code" =~ ^[0-9]+$ ]]; then if [[ "$raw_exit_code" =~ ^[0-9]+$ ]]; then
exit_code="$raw_exit_code" exit_code="$raw_exit_code"
else else

View File

@@ -38,13 +38,13 @@
# - Captures app-declared resource defaults (CPU, RAM, Disk) # - Captures app-declared resource defaults (CPU, RAM, Disk)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
variables() { variables() {
NSAPP=$(echo "${APP,,}" | tr -d ' ') # This function sets the NSAPP variable by converting the value of the APP variable to lowercase and removing any spaces. NSAPP=$(echo "${APP,,}" | tr -d ' ') # This function sets the NSAPP variable by converting the value of the APP variable to lowercase and removing any spaces.
var_install="${NSAPP}-install" # sets the var_install variable by appending "-install" to the value of NSAPP. var_install="${NSAPP}-install" # sets the var_install variable by appending "-install" to the value of NSAPP.
INTEGER='^[0-9]+([.][0-9]+)?$' # it defines the INTEGER regular expression pattern. INTEGER='^[0-9]+([.][0-9]+)?$' # it defines the INTEGER regular expression pattern.
PVEHOST_NAME=$(hostname) # gets the Proxmox Hostname and sets it to Uppercase PVEHOST_NAME=$(hostname) # gets the Proxmox Hostname and sets it to Uppercase
DIAGNOSTICS="yes" # sets the DIAGNOSTICS variable to "yes", used for the API call. DIAGNOSTICS="yes" # sets the DIAGNOSTICS variable to "yes", used for the API call.
METHOD="default" # sets the METHOD variable to "default", used for the API call. METHOD="default" # sets the METHOD variable to "default", used for the API call.
RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" # generates a random UUID and sets it to the RANDOM_UUID variable. RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" # generates a random UUID and sets it to the RANDOM_UUID variable.
SESSION_ID="${RANDOM_UUID:0:8}" # Short session ID (first 8 chars of UUID) for log files SESSION_ID="${RANDOM_UUID:0:8}" # Short session ID (first 8 chars of UUID) for log files
BUILD_LOG="/tmp/create-lxc-${SESSION_ID}.log" # Host-side container creation log BUILD_LOG="/tmp/create-lxc-${SESSION_ID}.log" # Host-side container creation log
@@ -4780,7 +4780,6 @@ EOF'
export VERBOSE="yes" export VERBOSE="yes"
export var_verbose="yes" export var_verbose="yes"
# Show rebuild summary # Show rebuild summary
echo -e "${YW}Rebuilding with preserved settings:${CL}" echo -e "${YW}Rebuilding with preserved settings:${CL}"
echo -e " Container ID: ${old_ctid}${CTID}" echo -e " Container ID: ${old_ctid}${CTID}"
@@ -4882,7 +4881,6 @@ EOF'
export var_verbose="yes" export var_verbose="yes"
export RECOVERY_ATTEMPT=$((${RECOVERY_ATTEMPT:-0} + 1)) export RECOVERY_ATTEMPT=$((${RECOVERY_ATTEMPT:-0} + 1))
echo -e "${YW}Rebuilding with increased resources (attempt ${RECOVERY_ATTEMPT}/2):${CL}" echo -e "${YW}Rebuilding with increased resources (attempt ${RECOVERY_ATTEMPT}/2):${CL}"
echo -e " Container ID: ${old_ctid}${CTID}" echo -e " Container ID: ${old_ctid}${CTID}"
echo -e " RAM: ${old_ram}${GN}${RAM_SIZE}${CL} MiB (x2)" echo -e " RAM: ${old_ram}${GN}${RAM_SIZE}${CL} MiB (x2)"
@@ -4926,9 +4924,6 @@ EOF'
fi fi
;; ;;
esac esac
else else
# Timeout - auto-remove # Timeout - auto-remove
@@ -5355,7 +5350,6 @@ create_lxc_container() {
exit 206 exit 206
fi fi
# Report installation start to API early - captures failures in storage/template/create # Report installation start to API early - captures failures in storage/template/create
post_to_api post_to_api