Skip to content

Commit

Permalink
--tty failed with --xc #464
Browse files Browse the repository at this point in the history
  • Loading branch information
mviereck committed Aug 12, 2022
1 parent 32cbe45 commit 5e26db9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Project website: https://github.com/mviereck/x11docker

## [Unreleased]
### Fixed
- `--tty` failed with `--xc`. Fix: disable `--xc`.
[(464)](https://github.com/mviereck/x11docker/issues/464)

## [7.4.2](https://github.com/mviereck/x11docker/releases/tag/v7.4.2) - 2022-08-7
### Fixed
- `--xpra*`: Fix for Wayland+X11 on host. Use Wayland for xpra client.
Expand Down
9 changes: 8 additions & 1 deletion x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Run 'x11docker --help' or scroll down to read usage information.
# More documentation at: https://github.com/mviereck/x11docker

Version="7.4.2"
Version="7.4.3-beta-1"

# --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups. (deprecated)
grep -q -- "--enforce-i" <<< "$*" && case $- in
Expand Down Expand Up @@ -2833,6 +2833,13 @@ check_vt() { # option --xorg: find free vt / tty
check_xcontainer() { # option --xc: check backend, rootless and image x11docker/xserver
local Auto= Fail=

# workaround: X server options not supported by --xc already catched here if they are specified on cli
case "$Xserver" in
--tty|--hostwayland)
check_xdepends "$Xserver" && Xcontainer="no"
;;
esac

# check if X container should run rootful or rootless (for tty access it must be rootful)
case "$Backendrootless" in
yes)
Expand Down

0 comments on commit 5e26db9

Please sign in to comment.