Commit 4354877d authored by Mike Gabriel's avatar Mike Gabriel
Browse files

x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as...

x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as provided by Ubuntu 18.04 or later.
parent ad81e38d
......@@ -10,6 +10,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
- Add man page for x2gocleansessions.
- x2goserver/man/man8/x2golistsessions_root.8: Mention --all-servers
option. (Fixes: #1395).
- x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive)
as provided by Ubuntu 18.04 or later.
* debian/x2goserver.postinst:
+ Drop duplicate sourcing of debconf includes.
+ Add Dutch debconf translation. Thanks to Frans Spiesschaert.
......
......@@ -128,7 +128,7 @@ fi
# Note that we are assuming that the user has gnome-session
# 3.9.90-0ubuntu12.1 or later on 14.04, or 3.9.90-0ubuntu16.1 on
# 14.10, which added --disable-acceleration-check .
# Ubuntu 15.04 (vivid) & later:
# Ubuntu 15.04 (vivid) up to 17.10 (artful):
# GNOME -> gnome-session --session=gnome-flashback-metacity --disable-acceleration-check
# UNITY -> gnome-session --session=ubuntu
# (GNOME3 based desktop shells)
......@@ -142,10 +142,21 @@ fi
#
# Also note that the XDG_CURRENT_DESKTOP value comes from
# "DesktopNames" in the /usr/share/xsessions/ .desktop file
# Ubuntu 18.04 (bionic) & later (must use X2Go Kdrive)
#
# UBUNTU (GNOME-based) ->
# env GNOME_SHELL_SESSION_MODE=ubuntu
# gnome-session --session=ubuntu
if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then
cmd="/usr/bin/gnome-session"
if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 15.04" | bc)" == "1" ]; then
if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 18.04" | bc)" == "1" ]; then
export DESKTOP_SESSION="ubuntu"
export XGD_SESSION_DESKTOP="$DESKTOP_SESSION"
export GNOME_SHELL_SESSION_MODE="ubuntu"
args=" --session=ubuntu"
elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 15.04" | bc)" == "1" ] && [ "$(echo "$DISTRIB_RELEASE <= 17.11" | bc)" == "1" ]; then
export DESKTOP_SESSION="gnome-flashback-metacity"
if [ -z "$GTK_MODULES" ] ; then
export GTK_MODULES="unity-gtk-module"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment