RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: move all disk_size configuration to quickget

This commit is contained in:
Martin Wimpress 2024-05-13 16:18:44 +01:00 committed by Martin Wimpress
parent 99ccc0460b
commit 9cb021b174
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quickemu
View File

@ -525,10 +525,6 @@ function vm_boot() {
usb_controller="xhci" usb_controller="xhci"
sound_card="ac97" sound_card="ac97"
fi fi
if [ -z "${disk_size}" ]; then
disk_size="16G"
fi
;; ;;
kolibrios|reactos) kolibrios|reactos)
CPU="-cpu qemu32,kvm=on" CPU="-cpu qemu32,kvm=on"
@ -625,7 +621,6 @@ function vm_boot() {
NET_DEVICE="vmxnet3" NET_DEVICE="vmxnet3"
USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci";; USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci";;
esac esac
disk_size="${disk_size:-128G}"
;; ;;
windows|windows-server) windows|windows-server)
if [ "${QEMU_VER_SHORT}" -gt 60 ]; then if [ "${QEMU_VER_SHORT}" -gt 60 ]; then
@ -646,17 +641,10 @@ function vm_boot() {
else else
GUEST_TWEAKS+=" -no-hpet" GUEST_TWEAKS+=" -no-hpet"
fi fi
if [ -z "${disk_size}" ]; then
disk_size="64G"
fi
SMM="on" SMM="on"
;; ;;
*) CPU="-cpu host,kvm=on" *) CPU="-cpu host,kvm=on"
NET_DEVICE="rtl8139" NET_DEVICE="rtl8139"
if [ -z "${disk_size}" ]; then
disk_size="32G"
fi
echo "WARNING! Unrecognised guest OS: ${guest_os}";; echo "WARNING! Unrecognised guest OS: ${guest_os}";;
esac esac
@ -1533,7 +1521,7 @@ boot="efi"
cpu_cores="" cpu_cores=""
disk_format="${disk_format:-qcow2}" disk_format="${disk_format:-qcow2}"
disk_img="${disk_img:-}" disk_img="${disk_img:-}"
disk_size="" disk_size="${disk_size:-16G}"
display="${display:-sdl}" display="${display:-sdl}"
extra_args="${extra_args:-}" extra_args="${extra_args:-}"
fixed_iso="" fixed_iso=""

6
quickget
View File

@ -1502,6 +1502,7 @@ EOF
echo "ram=\"2048M\"" >> "${CONF_FILE}" echo "ram=\"2048M\"" >> "${CONF_FILE}"
;; ;;
macos) macos)
echo "disk_size=\"128G\"" >> "${CONF_FILE}"
echo "macos_release=\"${RELEASE}\"" >> "${CONF_FILE}" echo "macos_release=\"${RELEASE}\"" >> "${CONF_FILE}"
# https://github.com/quickemu-project/quickemu/issues/438 # https://github.com/quickemu-project/quickemu/issues/438
if [ "${RELEASE}" == "monterey" ]; then if [ "${RELEASE}" == "monterey" ]; then
@ -1514,6 +1515,11 @@ EOF
# Minimum to install lobster testing is 18GB but 32GB are allocated for headroom # Minimum to install lobster testing is 18GB but 32GB are allocated for headroom
echo "disk_size=\"32G\"" >> "${CONF_FILE}" echo "disk_size=\"32G\"" >> "${CONF_FILE}"
fi fi
if [[ "${OS}" == "windows"* ]]; then
echo "disk_size=\"64G\"" >> "${CONF_FILE}"
fi
# Enable TPM for Windows 11 # Enable TPM for Windows 11
if [ "${OS}" == "windows" ] && [ "${RELEASE}" == 11 ] || [ "${OS}" == "windows-server" ] && [ "${RELEASE}" == "2022" ]; then if [ "${OS}" == "windows" ] && [ "${RELEASE}" == 11 ] || [ "${OS}" == "windows-server" ] && [ "${RELEASE}" == "2022" ]; then
echo "tpm=\"on\"" >> "${CONF_FILE}" echo "tpm=\"on\"" >> "${CONF_FILE}"