Fix for gnome-terminal if password prompt or docker pull are needed (#84

)
mviereck · Oct 30, 2018 · 09a4b15 · 09a4b15
1 parent ac5bcfe
commit 09a4b15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Project website: https://github.com/mviereck/x11docker
 
 ## [Unreleased]
 ### Fixed
+ - `gnome-terminal` did not appear for password prompt or `docker pull`.
+   [(#84)](https://github.com/mviereck/x11docker/issues/84)
  - Watch container pid 1 instead of container pid itself. Avoids issue on NixOS
    where users cannot see processes of other users, root or docker in this case.
    [(#83)](https://github.com/mviereck/x11docker/issues/83)

diff --git a/x11docker b/x11docker
@@ -5778,7 +5778,7 @@ check_terminalemulator() {      # check terminal for password prompt of su or su
   # Makes problems if X and Wayland are independently available at same time: xfce4-terminal
   # Works, but does not appear: 'guake -te'
 
-  Terminallist="xterm lxterm lxterminal stterm sakura termit pterm terminator terminology Eterm konsole qterminal gnome-terminal mate-terminal mrxvt rxvt xvt kterm mlterm xfce4-terminal mintty NOLUCK"
+  Terminallist="xterm mintty lxterm lxterminal stterm sakura termit pterm terminator terminology Eterm konsole qterminal gnome-terminal mate-terminal mrxvt rxvt xvt kterm mlterm xfce4-terminal NOLUCK"
   [ -z "$Hostdisplay" ] && {
     case $Xserver in
       --weston|--hostwayland)    Terminallist="konsole qterminal gnome-terminal NOLUCK" ;;
@@ -5801,7 +5801,8 @@ check_terminalemulator() {      # check terminal for password prompt of su or su
   }
   case $Pullterminal in
     xfce4-terminal) Pullterminal="$Pullterminal --disable-server -x" ;;
-    gnome-terminal|mate-terminal) Pullterminal="dbus-run-session $Pullterminal -x" ;;
+    mate-terminal)  Pullterminal="dbus-run-session $Pullterminal -x" ;;
+    gnome-terminal) Pullterminal="dbus-launch $Pullterminal --" ;;
     terminator)     Pullterminal="dbus-run-session $Pullterminal --no-dbus -x" ;;
     konsole)        Pullterminal="dbus-run-session $Pullterminal --nofork -e" ;;
     bash)           Pullterminal="bash -c" ;;