This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4354877dea35eef4f2b1689d8c65d8bf769e5f3b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 28 20:59:25 2019 +0200 x2goruncommand: Support GNOME-based Ubuntu sessions (via X2Go Kdrive) as provided by Ubuntu 18.04 or later. --- debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cd45bf7..86692f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 34fcc816..5a553043 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -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" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git