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

Side by Side Diff: session_manager_setup.sh

Issue 6877059: [login_manager] Start chrome with opencryptoki flag if user enables the lab (Closed) Base URL: ssh://gitrw.chromium.org:9222/login_manager.git@master
Patch Set: Created 9 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 | Annotate | Revision Log
« 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 # Set up to start the X server ASAP, then let the startup run in the 7 # Set up to start the X server ASAP, then let the startup run in the
8 # background while we set up other stuff. 8 # background while we set up other stuff.
9 XAUTH_FILE="/var/run/chromelogin.auth" 9 XAUTH_FILE="/var/run/chromelogin.auth"
10 MCOOKIE=$(head -c 8 /dev/urandom | openssl md5) # speed this up? 10 MCOOKIE=$(head -c 8 /dev/urandom | openssl md5) # speed this up?
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 # Look to see if there are touch devices. 244 # Look to see if there are touch devices.
245 TOUCH_LIST_PATH=/etc/touch-devices 245 TOUCH_LIST_PATH=/etc/touch-devices
246 TOUCH_DEVICES= 246 TOUCH_DEVICES=
247 if [ -s $TOUCH_LIST_PATH ] ; then 247 if [ -s $TOUCH_LIST_PATH ] ; then
248 DEVICE_LIST="$(cat $TOUCH_LIST_PATH)" 248 DEVICE_LIST="$(cat $TOUCH_LIST_PATH)"
249 if [ "${DEVICE_LIST%%[,0-9]*}" = "" ] ; then 249 if [ "${DEVICE_LIST%%[,0-9]*}" = "" ] ; then
250 TOUCH_DEVICES="--touch-devices='$DEVICE_LIST'" 250 TOUCH_DEVICES="--touch-devices='$DEVICE_LIST'"
251 fi 251 fi
252 fi 252 fi
253 253
254 # TODO(crosbug.com/14277): Make this a default.
255 PKCS11_FLAGS=
256 if [ -r "/home/chronos/.cryptohome-init-pkcs11" ]; then
257 PKCS11_FLAGS=--load-opencryptoki
258 fi
259
254 # Use OpenGL acceleration flags except on ARM 260 # Use OpenGL acceleration flags except on ARM
255 if [ "$(uname -m)" != "armv7l" ] ; then 261 if [ "$(uname -m)" != "armv7l" ] ; then
256 ACCELERATED_FLAGS="--enable-accelerated-layers" 262 ACCELERATED_FLAGS="--enable-accelerated-layers"
257 else 263 else
258 ACCELERATED_FLAGS="--use-gl=egl" 264 ACCELERATED_FLAGS="--use-gl=egl"
259 fi 265 fi
260 266
261 # If screensaver use isn't disabled, set screensaver. 267 # If screensaver use isn't disabled, set screensaver.
262 SCREENSAVERS_PATH=/usr/share/chromeos-assets/screensavers 268 SCREENSAVERS_PATH=/usr/share/chromeos-assets/screensavers
263 SCREENSAVER_FLAG= 269 SCREENSAVER_FLAG=
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 --parallel-auth \ 334 --parallel-auth \
329 --scroll-pixels=4 \ 335 --scroll-pixels=4 \
330 --reload-killed-tabs \ 336 --reload-killed-tabs \
331 --user-data-dir="$DATA_DIR" \ 337 --user-data-dir="$DATA_DIR" \
332 "$REGISTER_PLUGINS" \ 338 "$REGISTER_PLUGINS" \
333 "$TOUCH_DEVICES" \ 339 "$TOUCH_DEVICES" \
334 ${ACCELERATED_FLAGS} \ 340 ${ACCELERATED_FLAGS} \
335 ${FLASH_FLAGS} \ 341 ${FLASH_FLAGS} \
336 ${SCREENSAVER_FLAG} \ 342 ${SCREENSAVER_FLAG} \
337 ${SKIP_OOBE} \ 343 ${SKIP_OOBE} \
344 ${PKCS11_FLAGS} \
338 -- "$WM_SCRIPT" 345 -- "$WM_SCRIPT"
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