community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted

Browse Source
This commit is contained in:
CanbiZ 2025-05-20 09:19:14 +02:00
parent 8428c9a449
commit 0e626b5028
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
misc/build.func
View File

@ -19,12 +19,10 @@ source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxV
if command -v curl >/dev/null 2>&1; then if command -v curl >/dev/null 2>&1; then
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func)
load_functions load_functions
setup_trap_abort_handling
#echo "(build.func) Loaded core.func via curl" #echo "(build.func) Loaded core.func via curl"
elif command -v wget >/dev/null 2>&1; then elif command -v wget >/dev/null 2>&1; then
source <(wget -qO- https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) source <(wget -qO- https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func)
load_functions load_functions
setup_trap_abort_handling
#echo "(build.func) Loaded core.func via wget" #echo "(build.func) Loaded core.func via wget"
fi fi
@ -1077,28 +1075,8 @@ EOF'
pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gnupg2 >/dev/null" pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gnupg2 >/dev/null"
fi fi
msg_ok "Customized LXC Container" msg_ok "Customized LXC Container"
lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/install/$var_install.sh)" $?
# Remote-Skript innerhalb des Containers mit Trap sauber ausführen
lxc-attach -n "$CTID" -- env var_install="$var_install" bash -c '
set -e
trap "echo Aborted in container; exit 130" SIGINT SIGTERM
tmp_script="/tmp/install_remote.sh"
curl -fsSL "https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/install/${var_install}.sh" -o "$tmp_script"
chmod +x "$tmp_script"
bash "$tmp_script"
'
exit_code=$?
if [[ "$exit_code" -eq 130 || "$exit_code" -eq 143 ]]; then
echo
msg_error "Script aborted by user inside container"
exit "$exit_code"
elif [[ "$exit_code" -ne 0 ]]; then
echo
msg_error "Install script failed in container (exit code $exit_code)"
exit "$exit_code"
fi
} }
# This function sets the description of the container. # This function sets the description of the container.

1
misc/install.func
View File

@ -12,7 +12,6 @@ if ! command -v curl >/dev/null 2>&1; then
fi fi
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func)
load_functions load_functions
setup_trap_abort_handling
# # Function to set STD mode based on verbosity # # Function to set STD mode based on verbosity
# set_std_mode() { # set_std_mode() {