| From f60631a94a09dc965d30bac060872fd74fe863d3 Mon Sep 17 00:00:00 2001 |
| From: Simon Que <sque@chromium.org> |
| Date: Sun, 24 Jun 2012 17:33:09 -0700 |
| Subject: [PATCH] Remove X from session_manager_setup.sh |
| |
| Change-Id: Ic6fe86997cbe9fb6e01be4939ec64edad295def8 |
| Signed-off-by: Simon Que <sque@chromium.org> |
| --- |
| session_manager_setup.sh | 29 ----------------------------- |
| 1 files changed, 0 insertions(+), 29 deletions(-) |
| |
| diff --git a/session_manager_setup.sh b/session_manager_setup.sh |
| index 308e927..9751daf 100755 |
| --- a/session_manager_setup.sh |
| +++ b/session_manager_setup.sh |
| @@ -4,17 +4,6 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| |
| -# Set up to start the X server ASAP, then let the startup run in the |
| -# background while we set up other stuff. |
| -XAUTH_FILE="/var/run/chromelogin.auth" |
| -MCOOKIE=$(mcookie) |
| -xauth -q -f ${XAUTH_FILE} add :0 . ${MCOOKIE} |
| - |
| -# The X server sends SIGUSR1 to its parent once it's ready to accept |
| -# connections. The subshell here starts X, waits for the signal, then |
| -# terminates once X is ready. |
| -( trap 'exit 0' USR1 ; xstart.sh ${XAUTH_FILE} & wait ) & |
| - |
| USE_FLAGS=$(cat /etc/session_manager_use_flags.txt) |
| |
| # Returns success if the USE flag passed as its sole parameter was defined. |
| @@ -101,8 +90,6 @@ export XAUTHORITY=${DATA_DIR}/.Xauthority |
| |
| mkdir -p ${DATA_DIR} && chown ${USER}:${USER} ${DATA_DIR} |
| mkdir -p ${HOME} && chown ${USER}:${USER} ${HOME} |
| -xauth -q -f ${XAUTHORITY} add :0 . ${MCOOKIE} && |
| - chown ${USER}:${USER} ${XAUTHORITY} |
| |
| # Old builds will have a ${LOGIN_PROFILE_DIR} that's owned by root; newer ones |
| # won't have this directory at all. |
| @@ -293,22 +280,6 @@ chown -R chronos /tmp/cgroup/cpu/chrome_renderers |
| # For i18n keyboard support (crbug.com/116999) |
| export LC_CTYPE=en_US.utf8 |
| |
| -# The subshell that started the X server will terminate once X is |
| -# ready. Wait here for that event before continuing. |
| -# |
| -# RED ALERT! The code from the 'wait' to the end of the script is |
| -# part of the boot time critical path. Every millisecond spent after |
| -# the wait is a millisecond longer till the login screen. |
| -# |
| -# KEEP THIS CODE PATH CLEAN! The code must be obviously fast by |
| -# inspection; nothing should go after the wait that isn't required |
| -# for correctness. |
| - |
| -wait |
| - |
| -initctl emit x-started |
| -bootstat x-started |
| - |
| # When X starts, it copies the contents of the framebuffer to the root |
| # window. We clear the framebuffer here to make sure that it doesn't flash |
| # back onscreen when X exits later. |
| -- |
| 1.7.7.3 |
| |
