numbus/numbus-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seems to fix the recap section

Browse Source
This commit is contained in:
Raphael Numbus
2025-12-07 11:39:23 +01:00
parent 3d102bccee
commit fa185d4515
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy.sh
+6 -14
View File
@@ -405,10 +405,14 @@ The mirror will be created using the size of the smaller disk, and any extra spa
elif (( num_selected == 1 )); then # If only one data disk is selected, it is a content disk elif (( num_selected == 1 )); then # If only one data disk is selected, it is a content disk
num_content=1 num_content=1
num_parity=0 num_parity=0
NUMBER_OF_CONTENT_DISKS=$num_content
NUMBER_OF_PARITY_DISKS=$num_parity
elif (( num_selected > 2 )); then # If more than two data disks are selected elif (( num_selected > 2 )); then # If more than two data disks are selected
# 1 parity for up to 2 content disks. # 1 parity for up to 2 content disks.
num_parity=$(( (num_selected + 2) / 3 )) num_parity=$(( (num_selected + 2) / 3 ))
num_content=$(( num_selected - num_parity )) num_content=$(( num_selected - num_parity ))
NUMBER_OF_CONTENT_DISKS=$num_content
NUMBER_OF_PARITY_DISKS=$num_parity
fi fi
if (( num_selected != 2 )); then if (( num_selected != 2 )); then
@@ -445,18 +449,6 @@ The mirror will be created using the size of the smaller disk, and any extra spa
[[ -n "$BOOT_DISK_1" ]] && NUMBER_OF_BOOT_DISKS=$((NUMBER_OF_BOOT_DISKS + 1)) && export BOOT_DISK_1 [[ -n "$BOOT_DISK_1" ]] && NUMBER_OF_BOOT_DISKS=$((NUMBER_OF_BOOT_DISKS + 1)) && export BOOT_DISK_1
[[ -n "$BOOT_DISK_2" ]] && NUMBER_OF_BOOT_DISKS=$((NUMBER_OF_BOOT_DISKS + 1)) && export BOOT_DISK_2 [[ -n "$BOOT_DISK_2" ]] && NUMBER_OF_BOOT_DISKS=$((NUMBER_OF_BOOT_DISKS + 1)) && export BOOT_DISK_2
NUMBER_OF_CONTENT_DISKS=0
for i in {1..6}; do
disk_var="CONTENT_DISK_$i"
[[ -n "${!disk_var}" ]] && NUMBER_OF_CONTENT_DISKS=$((NUMBER_OF_CONTENT_DISKS + 1))
done
NUMBER_OF_PARITY_DISKS=0
for i in {1..3}; do
disk_var="PARITY_DISK_$i"
[[ -n "${!disk_var}" ]] && NUMBER_OF_PARITY_DISKS=$((NUMBER_OF_PARITY_DISKS + 1))
done
RECAP_CONTENT=$(cat <<EOF RECAP_CONTENT=$(cat <<EOF
### Disk Configuration Summary ### Disk Configuration Summary
@@ -467,11 +459,11 @@ Please review the selected disk layout before proceeding.
$( [[ -n "$BOOT_DISK_2" ]] && echo "* **Boot 2:** \`$BOOT_DISK_2\`" || echo "* **Boot 2:** *Not configured*") $( [[ -n "$BOOT_DISK_2" ]] && echo "* **Boot 2:** \`$BOOT_DISK_2\`" || echo "* **Boot 2:** *Not configured*")
**Data Disks ($NUMBER_OF_CONTENT_DISKS):** **Data Disks ($NUMBER_OF_CONTENT_DISKS):**
$(for i in {1..6}; do disk_var="CONTENT_DISK_$i"; [[ -n "${!disk_var}" ]] && echo "* **Data $i:** \`${!disk_var}\`"; done) $(for i in $(seq 1 $NUMBER_OF_CONTENT_DISKS); do disk_var="CONTENT_DISK_$i"; [[ -n "${!disk_var}" ]] && echo "* **Data $i:** \`${!disk_var}\`"; done)
$( [[ $NUMBER_OF_CONTENT_DISKS -eq 0 ]] && echo "* *Not configured*") $( [[ $NUMBER_OF_CONTENT_DISKS -eq 0 ]] && echo "* *Not configured*")
**Parity Disks ($NUMBER_OF_PARITY_DISKS):** **Parity Disks ($NUMBER_OF_PARITY_DISKS):**
$(for i in {1..3}; do disk_var="PARITY_DISK_$i"; [[ -n "${!disk_var}" ]] && echo "* **Parity $i:** \`${!disk_var}\`"; done) $(for i in $(seq 1 $NUMBER_OF_PARITY_DISKS); do disk_var="PARITY_DISK_$i"; [[ -n "${!disk_var}" ]] && echo "* **Parity $i:** \`${!disk_var}\`"; done)
$( [[ $NUMBER_OF_PARITY_DISKS -eq 0 ]] && echo "* *Not configured*") $( [[ $NUMBER_OF_PARITY_DISKS -eq 0 ]] && echo "* *Not configured*")
EOF EOF
) )