diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 22:02:30 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 22:02:30 +0000 |
| commit | eb2180ec59896fae7ba3a20a0bff33ac8dd5f3fc (patch) | |
| tree | bbeeeb7fc7d169598f0fba1be5920a649c41d726 /remoting | |
| parent | 6cb732e80a0d80bd51150e8129714ec14fe7fc06 (diff) | |
| download | chromium_src-eb2180ec59896fae7ba3a20a0bff33ac8dd5f3fc.zip chromium_src-eb2180ec59896fae7ba3a20a0bff33ac8dd5f3fc.tar.gz chromium_src-eb2180ec59896fae7ba3a20a0bff33ac8dd5f3fc.tar.bz2 | |
Run Virtual Me2Me sessions via /etc/X11/Xsession
This is so that the system startup files in /etc/X11/Xsession.d/ are sourced
before running the chosen session.
BUG=139846
Review URL: https://chromiumcodereview.appspot.com/10843011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 09373d3..21eebb6 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -493,10 +493,11 @@ def choose_x_session(): # "unity-2d-panel" was chosen here simply because it appears in the TryExec # line of the session's .desktop file; other choices might be just as good. for test_file, command in [ - ("/usr/bin/gnome-session-fallback", "/usr/bin/gnome-session-fallback"), + ("/usr/bin/gnome-session-fallback", + ["/etc/X11/Xsession", "gnome-session-fallback"]), ("/etc/gdm/Xsession", "/etc/gdm/Xsession"), ("/usr/bin/unity-2d-panel", - ["/usr/bin/gnome-session", "--session=ubuntu-2d"]), + ["/etc/X11/Xsession", "/usr/bin/gnome-session --session=ubuntu-2d"]), ]: if os.path.exists(test_file): return command |