From 7e4f3e2a8eb6e91da23a02b7de581c59994c9ecb Mon Sep 17 00:00:00 2001
From: mviereck <bachbaum24@gmx.de>
Date: Mon, 4 Jun 2018 14:14:21 +0200
Subject: [PATCH] bugfix fedora 28: check for dockerd-current (#49). bugfix
 --auto: choose --hostdisplay if nothing else works

---
 CHANGELOG.md | 5 +++++
 x11docker    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46101d3a..13f22362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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. 
diff --git a/x11docker b/x11docker
index 06b1aa26..8773657b 100755
--- a/x11docker
+++ b/x11docker
@@ -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 "
@@ -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
 
@@ -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"
@@ -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)