Skip to content

Commit

Permalink
WSL2: no --xoverip by default. Allow Wayland setups. #214
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Jan 14, 2020
1 parent b70ff31 commit b807176
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Project website: https://github.com/mviereck/x11docker
## [Unreleased]
### Added
- WSL2 support. See also option `--mobyvm`.
[(#214)](https://github.com/mviereck/x11docker/issues/214)
- `--mobyvm`: New option to use MobyVM in WSL2.
Default for WSL2 is native linux docker.
- `--shell`: New option to specify preferred user shell.
Expand Down
14 changes: 8 additions & 6 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -2186,10 +2186,12 @@ check_xdepends() { # check dependencies on host for X server option
$Message "${1:-} not supported with --runtime=kata-runtime"
Return=1
}
[ "$Winsubsystem" ] && {
$Message "${1:-} not supported on MS Windows."
Return=1
}
case $Mobyvm in
yes)
$Message "${1:-} not supported with MobyVM / docker-for-win"
Return=1
;;
esac
;;
esac
case ${1:-} in
Expand Down Expand Up @@ -2486,8 +2488,8 @@ check_xserver() { # check chosen X server, auto-choose X server
[ -z "$Xoverip" ] && {
[ "$Runtime" = "kata-runtime" ] && Xoverip="yes"
[ "$Runsinsnap" = "yes" ] && Xoverip="yes"
case $Winsubsystem in
MSYS2|CYGWIN|WSL1|WSL2) Xoverip="yes" ;;
case $Mobyvm in
yes) Xoverip="yes" ;;
esac
[ "$Xoverip" = "yes" ] && [ "$Autochooseserver" = "no" ] && note "Enabled X over TCP instead of sharing unix socket."
}
Expand Down

0 comments on commit b807176

Please sign in to comment.