more strings instead of variables

This commit is contained in:
Jack
2020-01-27 14:34:21 +02:00
parent e7cd4d8a86
commit 177b3601a8
+3 -3
View File
@@ -678,7 +678,7 @@ function populate_virtual_disks() {
print_dimly "stage: populate_virtual_disks" print_dimly "stage: populate_virtual_disks"
# Attach virtual disk images of the base system, installation, and target # Attach virtual disk images of the base system, installation, and target
# to the virtual machine # to the virtual machine
VBoxManage storagectl "${vmname} --remove --name SATA >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --remove --name SATA >/dev/null 2>&1
if [[ -n $( if [[ -n $(
2>&1 VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null
2>&1 VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \ 2>&1 VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \
@@ -804,7 +804,7 @@ if [[ ( "${vbox_version:0:1}" -lt 6 ) || ( "${vbox_version:0:1}" = 6 && "${vbox_
clear_input_buffer_then_read clear_input_buffer_then_read
VBoxManage controlvm "${vmname}" poweroff >/dev/null 2>&1 VBoxManage controlvm "${vmname}" poweroff >/dev/null 2>&1
for (( i=10; i>5; i-- )); do printf ' \r'"${i}"; sleep 0.5; done for (( i=10; i>5; i-- )); do printf ' \r'"${i}"; sleep 0.5; done
VBoxManage storagectl macOS --remove --name SATA >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --remove --name SATA >/dev/null 2>&1
VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null 2>&1
VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \ VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \
--type hdd --nonrotational on --medium "${vmname}.vdi" --type hdd --nonrotational on --medium "${vmname}.vdi"
@@ -831,7 +831,7 @@ by running the following command at the script'"'"'s working directory:
'"${0} delete_temporary_files"'\n' '"${0} delete_temporary_files"'\n'
else else
# detach temporary VDIs and attach the macOS target disk # detach temporary VDIs and attach the macOS target disk
VBoxManage storagectl macOS --remove --name SATA >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --remove --name SATA >/dev/null 2>&1
VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null 2>&1 VBoxManage storagectl "${vmname}" --add sata --name SATA --hostiocache on >/dev/null 2>&1
VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \ VBoxManage storageattach "${vmname}" --storagectl SATA --port 0 \
--type hdd --nonrotational on --medium "${vmname}.vdi" --type hdd --nonrotational on --medium "${vmname}.vdi"