oSoWoSo
/
DistroHopper
mirror of https://github.com/oSoWoSo/DistroHopper.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor make_vm_config() to create distinctive VM config filenames

This commit is contained in:
Martin Wimpress 2022-02-21 20:29:22 +00:00
parent a939206288
commit 12d33eabcf
No known key found for this signature in database
GPG Key ID: 61DF940515E06DA3
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
quickget
View File

@ -640,15 +640,8 @@ function zsync_get() {
fi fi
} }
function start_vm_info() {
echo
echo "To start your ${OS} ${RELEASE} virtual machine run:"
echo " quickemu --vm ${OS}-${RELEASE}.conf"
echo
exit 0
}
function make_vm_config() { function make_vm_config() {
local CONF_FILE=""
local IMAGE_FILE="" local IMAGE_FILE=""
local ISO_FILE="" local ISO_FILE=""
local IMAGE_TYPE="" local IMAGE_TYPE=""
@ -678,40 +671,47 @@ function make_vm_config() {
IMAGE_TYPE="iso";; IMAGE_TYPE="iso";;
esac esac
if [ -n "${ISOTYPE}" ]; then if [ -n "${EDITION}" ]; then
RELEASE=${RELEASE}-${ISOTYPE} CONF_FILE="${OS}-${RELEASE}-${EDITION}.conf"
else
CONF_FILE="${OS}-${RELEASE}.conf"
fi fi
if [ ! -e "${OS}-${RELEASE}.conf" ]; then if [ ! -e "${CONF_FILE}" ]; then
echo "Making VM configuration for ${OS}-${RELEASE}..." echo "Making ${CONF_FILE}"
cat << EOF > "${OS}-${RELEASE}.conf" cat << EOF > "${CONF_FILE}"
guest_os="${GUEST}" guest_os="${GUEST}"
disk_img="${VM_PATH}/disk.qcow2" disk_img="${VM_PATH}/disk.qcow2"
${IMAGE_TYPE}="${VM_PATH}/${IMAGE_FILE}" ${IMAGE_TYPE}="${VM_PATH}/${IMAGE_FILE}"
EOF EOF
if [ -n "${ISO_FILE}" ]; then if [ -n "${ISO_FILE}" ]; then
echo "fixed_iso=\"${VM_PATH}/${ISO_FILE}\"" >> "${OS}-${RELEASE}.conf" echo "fixed_iso=\"${VM_PATH}/${ISO_FILE}\"" >> "${CONF_FILE}"
fi fi
# OS specific tweaks
case ${OS} in case ${OS} in
alma|cachyos|garuda|oraclelinux|rockylinux|void|zorin) echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf";; alma|cachyos|garuda|oraclelinux|rockylinux|void|zorin) echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
haiku|kolibrios|openbsd|slackware|tails) echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf";; haiku|kolibrios|openbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";;
macos) echo "macos_release=\"${RELEASE}\"" >> "${OS}-${RELEASE}.conf";; macos) echo "macos_release=\"${RELEASE}\"" >> "${CONF_FILE}";;
esac esac
# Enable TPM for Windows 11 # Enable TPM for Windows 11
if [ "${OS}" == "windows" ] && [ "${RELEASE}" -ge 11 ]; then if [ "${OS}" == "windows" ] && [ "${RELEASE}" -ge 11 ]; then
echo "tpm=\"on\"" >> "${OS}-${RELEASE}.conf" echo "tpm=\"on\"" >> "${CONF_FILE}"
# Only force SecureBoot on for non-Debian/Ubuntu distros. # Only force SecureBoot on for non-Debian/Ubuntu distros.
if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ] && [ -e "/usr/share/OVMF/OVMF_VARS_4M.fd" ]; then if [ -e "/usr/share/OVMF/OVMF_CODE_4M.fd" ] && [ -e "/usr/share/OVMF/OVMF_VARS_4M.fd" ]; then
SEC_BOOT="off" SEC_BOOT="off"
else else
SEC_BOOT="on" SEC_BOOT="on"
fi fi
echo "secureboot=\"${SEC_BOOT}\"" >> "${OS}-${RELEASE}.conf" echo "secureboot=\"${SEC_BOOT}\"" >> "${CONF_FILE}"
fi fi
fi fi
start_vm_info echo
echo "To start your $(pretty_name "${OS}") virtual machine run:"
echo " quickemu --vm ${CONF_FILE}"
echo
exit 0
} }
function get_android() { function get_android() {