RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Meta: Don't override SERENITY_QEMU_DISPLAY_DEVICE if it is already set

Browse source
This commit is contained in:
Andrew Pietila 2022-02-01 14:35:22 -06:00 • committed by Brian Gianforcaro
parent fbb798f98c
commit 3758dffd16
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meta/run.sh
View file

@ -183,14 +183,16 @@ else
SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=off}" SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=off}"
fi fi
if [ "$SERENITY_SCREENS" -gt 1 ]; then if [ -z "$SERENITY_QEMU_DISPLAY_DEVICE" ]; then
if [ "$SERENITY_SCREENS" -gt 1 ]; then
SERENITY_QEMU_DISPLAY_DEVICE="virtio-vga,max_outputs=$SERENITY_SCREENS " SERENITY_QEMU_DISPLAY_DEVICE="virtio-vga,max_outputs=$SERENITY_SCREENS "
# QEMU appears to always relay absolute mouse coordinates relative to the screen that the mouse is # QEMU appears to always relay absolute mouse coordinates relative to the screen that the mouse is
# pointed to, without any way for us to know what screen it was. So, when dealing with multiple # pointed to, without any way for us to know what screen it was. So, when dealing with multiple
# displays force using relative coordinates only # displays force using relative coordinates only
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off" SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off"
else else
SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 " SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 "
fi
fi fi
# Check if SERENITY_NVME_ENABLE is unset # Check if SERENITY_NVME_ENABLE is unset