community-scripts/ProxmoxVED
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVED.git synced 2026-02-25 16:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve storage selection logic in build script

Browse Source 
Adds checks to ensure the default.vars file exists before storage selection. Updates LXC container creation to skip storage selection if variables are already set, improving efficiency and reliability.
This commit is contained in:
CanbiZ
2025-09-24 08:42:53 +02:00
parent 02734e2b00
commit dfa6bcf9c7
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
misc/build.func
View File

@@ -1632,7 +1632,12 @@ install_script() {
METHOD="default"
base_settings "$VERBOSE"
echo_default
[[ -f /usr/local/community-scripts/default.vars ]] || {
mkdir -p /usr/local/community-scripts
touch /usr/local/community-scripts/default.vars
}
ensure_storage_selection_for_vars_file "/usr/local/community-scripts/default.vars"
;;
2 | advanced | ADVANCED)
header_info
@@ -1640,7 +1645,12 @@ install_script() {
METHOD="advanced"
base_settings
advanced_settings
[[ -f /usr/local/community-scripts/default.vars ]] || {
mkdir -p /usr/local/community-scripts
touch /usr/local/community-scripts/default.vars
}
ensure_storage_selection_for_vars_file "/usr/local/community-scripts/default.vars"
maybe_offer_save_app_defaults
;;
3 | mydefaults | MYDEFAULTS)
@@ -2781,11 +2791,13 @@ create_lxc_container() {
msg_ok "Storage ${BL}${TEMPLATE_STORAGE}${CL} (${TEMPLATE_STORAGE_INFO}) [Template]"
else
while true; do
if select_storage template; then
TEMPLATE_STORAGE="$STORAGE_RESULT"
TEMPLATE_STORAGE_INFO="$STORAGE_INFO"
msg_ok "Storage ${BL}${TEMPLATE_STORAGE}${CL} (${TEMPLATE_STORAGE_INFO}) [Template]"
break
if [[ -z "${var_template_storage:-}" ]]; then
if select_storage template; then
TEMPLATE_STORAGE="$STORAGE_RESULT"
TEMPLATE_STORAGE_INFO="$STORAGE_INFO"
msg_ok "Storage ${BL}${TEMPLATE_STORAGE}${CL} (${TEMPLATE_STORAGE_INFO}) [Template]"
break
fi
fi
done
fi
@@ -2796,14 +2808,13 @@ create_lxc_container() {
CONTAINER_STORAGE_INFO="$STORAGE_INFO"
msg_ok "Storage ${BL}${CONTAINER_STORAGE}${CL} (${CONTAINER_STORAGE_INFO}) [Container]"
else
while true; do
if [[ -z "${var_container_storage:-}" ]]; then
if select_storage container; then
CONTAINER_STORAGE="$STORAGE_RESULT"
CONTAINER_STORAGE_INFO="$STORAGE_INFO"
msg_ok "Storage ${BL}${CONTAINER_STORAGE}${CL} (${CONTAINER_STORAGE_INFO}) [Container]"
break
fi
done
fi
fi
# Validate content types