Skip to content

Commit

Permalink
Meta: Automatically use WSL paths on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
gunnarbeutner committed Jul 10, 2021
1 parent 9026dbb commit ee7e9f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 0 additions & 7 deletions Documentation/BuildInstructionsWindows.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,10 @@ By default this will be located at `/mnt/c/Program Files/qemu/qemu-system-i386.e
- Set the `SERENITY_QEMU_BIN` environment variable to the location above. For example: \
`export SERENITY_QEMU_BIN='/mnt/c/Program Files/qemu/qemu-system-i386.exe'`

- Locate the _Windows_ path to the SerenityOS disk image, as native QEMU will be accessing it via the Windows filesystem.
If your build tree is located in the WSL2 partition, this will be accessible under the `\\wsl$` network file share
(see [notes below](#note-on-filesystems)).

- Set the `SERENITY_KERNEL_CMDLINE` environment variable to disable VirtIO support (Because it is currently broken on
native windows QEMU):
`export SERENITY_KERNEL_CMDLINE="disable_virtio"`

- Set the `SERENITY_DISK_IMAGE` environment variable to the full path of the SerenityOS disk image file from above.
For example: `export SERENITY_DISK_IMAGE='\\wsl$\Ubuntu-20.04\home\username\serenity\Build\i686\_disk_image'`

- `ninja run` as usual.

### Hardware acceleration
Expand Down
7 changes: 7 additions & 0 deletions Meta/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ fi
else
SERENITY_DISK_IMAGE="_disk_image"
fi
if command -v wslpath >/dev/null; then
case "$SERENITY_QEMU_BIN" in
/mnt/c/*)
SERENITY_DISK_IMAGE=$(wslpath -w "$SERENITY_DISK_IMAGE")
;;
esac
fi
}

if ! command -v "$SERENITY_QEMU_BIN" >/dev/null 2>&1 ; then
Expand Down

0 comments on commit ee7e9f0

Please sign in to comment.