diff options
| author | Andrew Pietila <andrew@hax.technology> | 2022-02-01 14:35:22 -0600 |
|---|---|---|
| committer | Brian Gianforcaro <b.gianfo@gmail.com> | 2022-02-06 18:29:25 +0000 |
| commit | 3758dffd16df6795c1086c9cde7319e46445d6c4 (patch) | |
| tree | 286f1d09380ab99d86f7531477e70e9d7692cba8 | |
| parent | fbb798f98c86c2422de006425dd8f87fda1d5b55 (diff) | |
| download | serenity-3758dffd16df6795c1086c9cde7319e46445d6c4.zip | |
Meta: Don't override SERENITY_QEMU_DISPLAY_DEVICE if it is already set
| -rwxr-xr-x | Meta/run.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 9ac8c97b4c..ebd4677402 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -183,14 +183,16 @@ else SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-gtk,gl=off}" fi -if [ "$SERENITY_SCREENS" -gt 1 ]; then - 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 - # pointed to, without any way for us to know what screen it was. So, when dealing with multiple - # displays force using relative coordinates only - SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off" -else - SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 " +if [ -z "$SERENITY_QEMU_DISPLAY_DEVICE" ]; then + if [ "$SERENITY_SCREENS" -gt 1 ]; then + 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 + # pointed to, without any way for us to know what screen it was. So, when dealing with multiple + # displays force using relative coordinates only + SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE vmmouse=off" + else + SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 " + fi fi # Check if SERENITY_NVME_ENABLE is unset |