The branch, master has been updated via e07883826b637ad0d6d82db3d515d22b6e8d1481 (commit) from 22d7413c1ee6133326095ed344e0c47a391c4deb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e07883826b637ad0d6d82db3d515d22b6e8d1481 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 7 00:36:46 2012 +0200 Detect desktop session mode to use for Ubuntu precise and later. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +-- x2goserver/bin/x2goruncommand | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c1a6c95..65019bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets translated into an executable command by x2goruncommand. - - Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the - commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand. + - Detect desktop session mode to use for Ubuntu precise and later. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index ec202ee..b19abfb 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -35,6 +35,7 @@ export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'` +args='' X2GO_ROOT="${HOME}/.x2go" MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput" @@ -71,16 +72,19 @@ fi # let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then - # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session. - # GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback. + cmd="/usr/bin/gnome-session" + # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session --session=ubuntu-2d. + # GNOME (Ubuntu classic) gets launched when calling gnome-session --session=gnome-fallback. if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then - cmd="/usr/bin/gnome-session-fallback" - else - cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="gnome-fallback" + args="--session=$DESKTOP_SESSION" fi + elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="ubuntu-2d" + args="--session=$DESKTOP_SESSION" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" @@ -168,12 +172,12 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "running command $EXEC" x2gofeature X2GO_XSESSION &>/dev/null && [ "x$X2GO_SESS_TYPE" = "xD" ] && { - STARTUP=$cmd + STARTUP="$cmd $args" $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\"" - STARTUP="$STARTUP" /etc/x2go/Xsession + /etc/x2go/Xsession "$STARTUP" } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command $EXEC..." - $cmd + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd $args\"..." + $cmd $args } #### some applications can quit immediately, we will wait here as long as x2goagent exists hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).