parallelvirtualcluster
/
pvc-installer
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Flip ID to end of detect string 

This just seems to "flow" more for me.
This commit is contained in:
Joshua Boniface 2023-09-01 15:41:59 -04:00
parent ec23da72a7
commit 98337295b1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
templates/install.sh
View File

@ -210,6 +210,7 @@ seed_config() {
host_macaddr=$( ip -br link show ${target_interface} | awk '{ print $3 }' ) host_macaddr=$( ip -br link show ${target_interface} | awk '{ print $3 }' )
host_ipaddr=$( ip -br address show ${target_interface} | awk '{ print $3 }' | awk -F '/' '{ print $1 }' ) host_ipaddr=$( ip -br address show ${target_interface} | awk '{ print $3 }' | awk -F '/' '{ print $1 }' )
o_target_disk="${target_disk}"
# Handle the target disk # Handle the target disk
case "${target_disk}" in case "${target_disk}" in
/dev/*) /dev/*)
@ -219,12 +220,12 @@ seed_config() {
detect:*) detect:*)
# Read the detect string into separate variables # Read the detect string into separate variables
# A detect string is formated thusly: # A detect string is formated thusly:
# detect:<Controller-or-Model-Name>:<0-indexed-ID>:<Capacity-in-human-units> # detect:<Controller-or-Model-Name>:<Capacity-in-human-units><0-indexed-ID>
# For example: # For example:
# detect:INTEL:1:800GB # detect:INTEL:800GB:1
# detect:DELLBOSS:0:240GB # detect:DELLBOSS:240GB:0
# detect:PERC H330 Mini:0:200GB # detect:PERC H330 Mini:200GB:0
IFS=: read detect b_name b_id b_size <<<"${target_disk}" IFS=: read detect b_name b_size b_id <<<"${target_disk}"
# Get the lsscsi output (exclude NVMe) # Get the lsscsi output (exclude NVMe)
lsscsi_data_all="$( lsscsi -s -N )" lsscsi_data_all="$( lsscsi -s -N )"
# Get the available sizes, and match to within +/- 2% # Get the available sizes, and match to within +/- 2%
@ -272,7 +273,7 @@ EOF
esac esac
if [[ ! -b ${target_disk} ]]; then if [[ ! -b ${target_disk} ]]; then
echo "Invalid disk or disk not found!" echo "Invalid disk or disk not found for '${o_target_disk}'!"
exit 1 exit 1
fi fi
@ -864,7 +865,7 @@ else
action="system-boot_initial" action="system-boot_initial"
fi fi
sleep 15 sleep 30
curl -X POST \ curl -X POST \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \