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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: session_manager_setup.sh
diff --git a/session_manager_setup.sh b/session_manager_setup.sh
index 94d3e7fc41b0465b33e120d16c65c6113021d89b..76766db143a9172ad01ee55510847a3aa923ddbd 100755
--- a/session_manager_setup.sh
+++ b/session_manager_setup.sh
@@ -251,6 +251,12 @@ if [ -s $TOUCH_LIST_PATH ] ; then
fi
fi
+# TODO(crosbug.com/14277): Make this a default.
+PKCS11_FLAGS=
+if [ -r "/home/chronos/.cryptohome-init-pkcs11" ]; then
+ PKCS11_FLAGS=--load-opencryptoki
+fi
+
# Use OpenGL acceleration flags except on ARM
if [ "$(uname -m)" != "armv7l" ] ; then
ACCELERATED_FLAGS="--enable-accelerated-layers"
@@ -335,4 +341,5 @@ exec /sbin/session_manager --uid=${USER_ID} -- \
${FLASH_FLAGS} \
${SCREENSAVER_FLAG} \
${SKIP_OOBE} \
+ ${PKCS11_FLAGS} \
-- "$WM_SCRIPT"
« 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