v5.4.2

mviereck · Feb 18, 2019 · faaf2a2 · faaf2a2
1 parent 44c276c
commit faaf2a2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Project website: https://github.com/mviereck/x11docker
 
-## [Unreleased]
+## [5.4.2](https://github.com/mviereck/x11docker/releases/tag/v5.4.2) - 2019-02-18
 ### Fixed
- - `--gpu`: Fixes for automatical NVIDIA driver installation.
+ - `--gpu`: Fixes for automated NVIDIA driver installation.
    [(#127)](https://github.com/mviereck/x11docker/issues/127)
 
 ## [5.4.1](https://github.com/mviereck/x11docker/releases/tag/v5.4.1) - 2019-02-08

diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ To run a host application on a new X server:
   x11docker [OPTIONS] --exe COMMAND
   x11docker [OPTIONS] --exe -- COMMAND [ARG1 ARG2 ...]
 To run only a new empty X server:
-  x11docker [OPTIONS]
+  x11docker [OPTIONS] --xonly
 ```
 `DOCKER_RUN_OPTIONS` are just added to `docker run` command without a check by x11docker.
 

diff --git a/x11docker b/x11docker
@@ -11,7 +11,7 @@
 # Type 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="5.4.2-beta"
+Version="5.4.2"
 
 usage() {                       # --help: show usage information
   echo "
@@ -26,7 +26,7 @@ To run a host application on a new X server:
   x11docker [OPTIONS] --exe COMMAND
   x11docker [OPTIONS] --exe -- COMMAND [ARG1 ARG2 ...]
 To run only a new empty X server:
-  x11docker [OPTIONS]
+  x11docker [OPTIONS] --xonly
 
 Optional features:
   * Hardware acceleration for OpenGL
@@ -4523,7 +4523,10 @@ create_containerrootrc() {      # create container root setup script: This scrip
     echo "      }"
     echo "      note 'Installing proprietary closed source NVIDIA driver
   version $Nvidiaversion. That slows down container startup.'"
-    echo "      sh $Cshare/NVIDIA-$Nvidiaversion.run  --accept-license --no-runlevel-check  --no-questions --ui=none --no-kernel-module --no-kernel-module-source --no-backup --tmpdir /tmp2"
+    echo "      sh $Cshare/NVIDIA-$Nvidiaversion.run --tmpdir /tmp2 \
+                                  --accept-license --no-runlevel-check --no-questions --no-backup --ui=none \
+                                  --no-kernel-module --no-kernel-module-source --no-nouveau-check --no-nvidia-modprobe"
+#                                  --x-prefix=/tmp/null --x-module-path=/tmp/null --x-library-path=/tmp/null --x-sysconfig-path=/tmp/null # not sure if that makes sense.
     echo "      rm -R /tmp2 && unset TMPDIR"
     echo "    } || note 'Skipping installation of $Cshare/NVIDIA-$Nvidiaversion.run'"
     echo "  ;;"

diff --git a/x11docker-gui b/x11docker-gui
@@ -179,7 +179,7 @@ ug_CN uk_UA unm_US ur_IN ur_PK uz_UZ ve_ZA vi_VN wa_BE wae_CH wal_ET wo_SN xh_ZA
 do Langcombo="$Langcombo,\"$Line\""; done
 
 # create combo of keymaps
-Keymaps="$(sed '/^! layout$/,/^ *$/!d ; //d' /usr/share/X11/xkb/rules/base.lst | awk '{print $1}' | sort)"
+Keymaps="$(sed '/^! layout$/,/^ *$/!d ; //d' /usr/share/X11/xkb/rules/base.lst 2>/dev/null | awk '{print $1}' | sort)"
 Hostkeymap="$(setxkbmap -query | grep layout | rev | cut -d' ' -f1 | rev)"
 Keymapscombo=\"$Hostkeymap\"
 Keymapscombo=${Keymapscombo:-\"\"}
@@ -823,7 +823,7 @@ Fallback: Will try to use image x11docker/kaptain."
 esac
 [ "$X11docker_icon" ] && X11docker_icon="--sharedir $X11docker_icon"
 { IFS= read Xenv ; read Kaptain_pid ; } < <($X11docker_exe $Verboseoption \
-                                                           --pull=yes \
+                                                           --pull=ask \
                                                            --stdin --showenv --showpid1 \
                                                            --clipboard --hostdisplay \
                                                            $X11docker_icon \