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

Improve storage selection logic in build script
Some checks failed
Bump build.func Revision / bump-revision (push) Has been cancelled
Details

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