From c147560731ec81b8f213d9498670e57232e8e3c6 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Fri, 19 Aug 2022 17:16:54 +0100 Subject: [PATCH] Refactor guest tweak for Batocera, KolobriOS, ReactOS, Haiku & FreeDOS --- quickemu | 32 ++++++++++---------------------- quickget | 8 ++++++-- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/quickemu b/quickemu index 2606407..c4eb32a 100755 --- a/quickemu +++ b/quickemu @@ -464,7 +464,7 @@ function vm_boot() { # Make any OS specific adjustments case ${guest_os} in - *bsd|haiku|freedos|linux) + batocera|*bsd|freedos|haiku|linux) CPU="-cpu host,kvm=on" if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then CPU="${CPU},topoext" @@ -472,7 +472,7 @@ function vm_boot() { if [ "${guest_os}" == "freebsd" ] || [ "${guest_os}" == "ghostbsd" ]; then MOUSE="usb" - elif [ "${guest_os}" == "haiku" ] || [ "${guest_os}" == "freedos" ]; then + elif [ "${guest_os}" == "batocera" ] || [ "${guest_os}" == "freedos" ] || [ "${guest_os}" == "haiku" ]; then MACHINE_TYPE="pc" NET_DEVICE="rtl8139" fi @@ -482,35 +482,23 @@ function vm_boot() { SMM="on" fi - if [ -z "${disk_size}" ]; then disk_size="16G" fi ;; - batocera) - CPU="-cpu host,kvm=on" - if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then - CPU="${CPU},topoext" - fi - MACHINE_TYPE="pc" - NET_DEVICE="rtl8139" - disk_size="8G" - ;; - kolibrios) + kolibrios|reactos) CPU="-cpu qemu32,kvm=on" if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then CPU="${CPU},topoext" fi MACHINE_TYPE="pc" - NET_DEVICE="rtl8139" - ;; - reactos) - CPU="-cpu qemu32,kvm=on" - if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then - CPU="${CPU},topoext" - fi - MACHINE_TYPE="pc" - NET_DEVICE="e1000" + case ${guest_os} in + kolibrios) NET_DEVICE="rtl8139";; + reactos) + NET_DEVICE="e1000" + KEYBOARD="ps2" + ;; + esac ;; macos) #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ diff --git a/quickget b/quickget index 4b93db3..0dd1d7d 100755 --- a/quickget +++ b/quickget @@ -759,8 +759,12 @@ EOF # OS specific tweaks case ${OS} in - alma|centos-stream|oraclelinux|rockylinux) echo "disk_size=\"32G\"" >> "${CONF_FILE}";; - dragonflybsd|haiku|openbsd|netbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";; + alma|centos-stream|oraclelinux|rockylinux) + echo "disk_size=\"32G\"" >> "${CONF_FILE}";; + batocera) + echo "disk_size=\"8G\"" >> "${CONF_FILE}";; + dragonflybsd|haiku|openbsd|netbsd|slackware|tails) + echo "boot=\"legacy\"" >> "${CONF_FILE}";; deepin) echo "disk_size=\"64G\"" >> "${CONF_FILE}" echo "ram=\"4G\"" >> "${CONF_FILE}"