Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Side by Side Diff: session_manager_setup.sh

Issue 1640006: [login_manager] throw the switch to in-chrome authentication (Closed)
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 2
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 XAUTH=/usr/bin/xauth 7 XAUTH=/usr/bin/xauth
8 XAUTH_FILE="/var/run/chromelogin.auth" 8 XAUTH_FILE="/var/run/chromelogin.auth"
9 SERVER_READY= 9 SERVER_READY=
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 rm -rf ${LOGIN_PROFILE_DIR} 82 rm -rf ${LOGIN_PROFILE_DIR}
83 mkdir -p ${LOGIN_PROFILE_DIR} 83 mkdir -p ${LOGIN_PROFILE_DIR}
84 mount -n -t tmpfs -onodev,noexec,nosuid loginprofile ${LOGIN_PROFILE_DIR} 84 mount -n -t tmpfs -onodev,noexec,nosuid loginprofile ${LOGIN_PROFILE_DIR}
85 chown ${USER}:${USER} ${LOGIN_PROFILE_DIR} 85 chown ${USER}:${USER} ${LOGIN_PROFILE_DIR}
86 86
87 # temporary hack to tell cryptohome that we're doing chrome-login 87 # temporary hack to tell cryptohome that we're doing chrome-login
88 touch /tmp/doing-chrome-login 88 touch /tmp/doing-chrome-login
89 89
90 CHROME_DIR="/opt/google/chrome" 90 CHROME_DIR="/opt/google/chrome"
91 CHROME="$CHROME_DIR/chrome" 91 CHROME="$CHROME_DIR/chrome"
92 COOKIE_PIPE="/tmp/cookie_pipe"
93 SEND_METRICS="/etc/send_metrics" 92 SEND_METRICS="/etc/send_metrics"
94 CONSENT_FILE="$DATA_DIR/Consent To Send Stats" 93 CONSENT_FILE="$DATA_DIR/Consent To Send Stats"
95 94
96 # xdg-open is used to open downloaded files. 95 # xdg-open is used to open downloaded files.
97 # It runs sensible-browser, which uses $BROWSER. 96 # It runs sensible-browser, which uses $BROWSER.
98 export BROWSER=${CHROME} 97 export BROWSER=${CHROME}
99 98
100 USER_ID=$(/usr/bin/id -u ${USER}) 99 USER_ID=$(/usr/bin/id -u ${USER})
101 100
102 SKIP_OOBE= 101 SKIP_OOBE=
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 137
139 exec /sbin/session_manager --uid=${USER_ID} --login -- \ 138 exec /sbin/session_manager --uid=${USER_ID} --login -- \
140 $CHROME --enable-gview \ 139 $CHROME --enable-gview \
141 --enable-sync \ 140 --enable-sync \
142 --log-level=0 \ 141 --log-level=0 \
143 "$CHROME_LOG_FLAG" \ 142 "$CHROME_LOG_FLAG" \
144 --main-menu-url="http://welcome-cros.appspot.com/menu" \ 143 --main-menu-url="http://welcome-cros.appspot.com/menu" \
145 --no-first-run \ 144 --no-first-run \
146 --user-data-dir=/home/$USER \ 145 --user-data-dir=/home/$USER \
147 --login-profile=user \ 146 --login-profile=user \
148 "--cookie-pipe=$COOKIE_PIPE" \ 147 --in-chrome-auth \
149 --enable-login-images \ 148 --enable-login-images \
150 "${SKIP_OOBE}" 149 "${SKIP_OOBE}"
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698