Skip to content

Commit

Permalink
bugfix fedora 28: check for dockerd-current (#49). bugfix --auto: cho…
Browse files Browse the repository at this point in the history
…ose --hostdisplay if nothing else works
  • Loading branch information
mviereck committed Jun 4, 2018
1 parent 958e7fe commit 7e4f3e2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
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
- fedora 28: check for docker daemon with name `dockerd-current` (#49)
- `--auto`: prefer `--hostdisplay` for seamless apps if nothing else is available.

## [4.3.2](https://github.com/mviereck/x11docker/releases/tag/v4.3.2) - 2018-06-03
### Changed
- `x11docker-gui` is interactive now. Live preview of generated command.
Expand Down
6 changes: 4 additions & 2 deletions x11docker
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Type 'x11docker --help' or scroll down to read usage information.
# More documentation at: https://github.com/mviereck/x11docker

Version="4.3.2"
Version="4.3.3-beta"

usage() { # --help: show usage information
echo "
Expand Down Expand Up @@ -1122,6 +1122,7 @@ writeaccess() { # check if useruid $1 has write access to folder $2
[ "w" = "$(getfacl -pn "${2:-}" | grep user:${1:-}: | rev | cut -c2)" ] && return 0 || return 1 # FIXME: could check write access for gid, if uid access fails.
fi
}

{ #### part: declare variables
trap finish EXIT

Expand Down Expand Up @@ -1824,6 +1825,7 @@ Parsed options: $Parsedoptions"
depends $Xserver || Xserver="--xephyr"
[ "$Xserver" = "--xephyr" ] && { depends --xephyr || {
depends --kwin-xwayland && Xserver="--kwin-xwayland"
depends --hostdisplay && [ "$Desktopmode" = "no" ] && Xserver="--hostdisplay"
depends --weston-xwayland && Xserver="--weston-xwayland"
depends --xpra && Xserver="--xpra"
depends --nxagent && Xserver="--nxagent"
Expand Down Expand Up @@ -3380,7 +3382,7 @@ done
run)
command -v docker >/dev/null || error "docker is not installed.
To run docker images, you need to install docker."
pidof dockerd >/dev/null || error "Please make sure docker daemon is running.
pidof dockerd >/dev/null || pidof dockerd-current >/dev/null || error "Please make sure docker daemon is running.
Try as root: 'systemctl start docker'"
;;
exe)
Expand Down

0 comments on commit 7e4f3e2

Please sign in to comment.