oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor swtpm support to catch when it is missing

Browse source 
Also adds the swtpm laucher to the debug shell script.
This commit is contained in:
Martin Wimpress 2021-10-19 00:07:24 +01:00
parent f23ace745a
commit b8d6b02796
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
quickemu
View file

@ -531,20 +531,6 @@ function vm_boot() {
echo " - CD-ROM: ${fixed_iso}" echo " - CD-ROM: ${fixed_iso}"
fi fi
# Enable TPM
if [ "${tpm}" == "on" ]; then
if command -v swtpm &>/dev/null; then
swtpm socket \
--ctrl type=unixio,path="${VMDIR}/${VMNAME}.swtpm-sock" \
--terminate \
--tpmstate dir="${VMDIR}" \
--tpm2 &
echo " - TPM: ${VMDIR}/${VMNAME}.swtpm-sock (${!})"
else
echo " - TPM: swtpm is not installed, TPM not available!"
fi
fi
# Determine a sane resolution for Linux guests. # Determine a sane resolution for Linux guests.
if [ "${guest_os}" == "linux" ]; then if [ "${guest_os}" == "linux" ]; then
local X_RES=1152 local X_RES=1152
@ -716,6 +702,23 @@ function vm_boot() {
enable_usb_passthrough enable_usb_passthrough
echo "#!/usr/bin/env bash" > "${VMDIR}/${VMNAME}.sh"
# Start TPM
if [ "${tpm}" == "on" ]; then
local tpm_args=()
# shellcheck disable=SC2054
tpm_args+=(socket
--ctrl type=unixio,path="${VMDIR}/${VMNAME}.swtpm-sock"
--terminate
--tpmstate dir="${VMDIR}"
--tpm2)
echo "${SWTPM} ${tpm_args[@]} &" >> "${VMDIR}/${VMNAME}.sh"
${SWTPM} "${tpm_args[@]}" >> "${VMDIR}/${VMNAME}.log" &
echo " - TPM: ${VMDIR}/${VMNAME}.swtpm-sock (${!})"
sleep 1
fi
# Boot the VM # Boot the VM
local args=() local args=()
@ -841,9 +844,7 @@ function vm_boot() {
SHELL_ARGS="${SHELL_ARGS//)/\\)}" SHELL_ARGS="${SHELL_ARGS//)/\\)}"
SHELL_ARGS="${SHELL_ARGS//Wimpys World/\"Wimpys World\"}" SHELL_ARGS="${SHELL_ARGS//Wimpys World/\"Wimpys World\"}"
echo "#!/usr/bin/env bash" > "${VMDIR}/${VMNAME}.sh"
echo "${QEMU}" "${SHELL_ARGS}" >> "${VMDIR}/${VMNAME}.sh" echo "${QEMU}" "${SHELL_ARGS}" >> "${VMDIR}/${VMNAME}.sh"
${QEMU} "${args[@]}" > "${VMDIR}/${VMNAME}.log" & ${QEMU} "${args[@]}" > "${VMDIR}/${VMNAME}.log" &
# If output is 'none' then SPICE was requested. # If output is 'none' then SPICE was requested.
@ -1054,6 +1055,14 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
if [ -n "${disk}" ]; then if [ -n "${disk}" ]; then
disk_size="${disk}" disk_size="${disk}"
fi fi
if [ "${tpm}" == "on" ]; then
SWTPM=$(command -v swtpm)
if [ ! -e "${SWTPM}" ]; then
echo "ERROR! TPM is enabled, but swtpm was not found."
exit 1
fi
fi
else else
echo "ERROR! Virtual machine configuration not found." echo "ERROR! Virtual machine configuration not found."
usage usage