Index: remoting/host/linux/linux_me2me_host.py |
diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py |
index 42a954704952b34c702289ae7ea15434083bcaee..d398e5239930e54228d3ca1406e320cdcd389253 100755 |
--- a/remoting/host/linux/linux_me2me_host.py |
+++ b/remoting/host/linux/linux_me2me_host.py |
@@ -56,6 +56,7 @@ CHROME_REMOTING_GROUP_NAME = "chrome-remote-desktop" |
HOME_DIR = os.environ["HOME"] |
CONFIG_DIR = os.path.join(HOME_DIR, ".config/chrome-remote-desktop") |
SESSION_FILE_PATH = os.path.join(HOME_DIR, ".chrome-remote-desktop-session") |
+SYSTEM_SESSION_FILE_PATH = "/etc/chrome-remote-desktop-session" |
X_LOCK_FILE_TEMPLATE = "/tmp/.X%d-lock" |
FIRST_X_DISPLAY_NUMBER = 20 |
@@ -537,7 +538,8 @@ def choose_x_session(): |
XSESSION_FILES = [ |
SESSION_FILE_PATH, |
"~/.xsession", |
- "~/.Xsession" ] |
+ "~/.Xsession", |
+ SYSTEM_SESSION_FILE_PATH ] |
Sergey Ulanov
2014/04/23 22:41:52
Maybe put this above .xsession? (it has higher cha
Lambros
2014/04/23 23:04:13
I'd like to get rid of .xsession completely. Moder
Sergey Ulanov
2014/04/24 00:10:21
sgtm
Lambros
2014/04/24 20:27:52
Done.
|
for startup_file in XSESSION_FILES: |
startup_file = os.path.expanduser(startup_file) |
if os.path.exists(startup_file): |