commit 4d27ca3f0e9995a8767006a1ed21493337594922
author Ken Mixter <kmixter@google.com> Tue Apr 19 23:06:11 2011
committer Ken Mixter <kmixter@google.com> Tue Apr 19 23:06:11 2011
tree 602e83cd033dd0b91b4db3ff34ede61e022dfdb8
parent 1ab3c743cf26003321986cde729b0dc82af15dec

[login_manager] Start chrome with opencryptoki flag if user enables the lab

Change-Id: I0cfffd6abe2528bb92debb4aea38fd4bd4055cb5

R=cmasone@chromium.org
BUG=chromium-os:12416
TEST=
default mode, no flag added
with file, --load-opencryptoki added

Review URL: http://codereview.chromium.org/6877059

session_manager_setup.sh

diff --git a/session_manager_setup.sh b/session_manager_setup.sh
index 94d3e7f..76766db 100755
--- a/session_manager_setup.sh
+++ b/session_manager_setup.sh
@@ -251,6 +251,12 @@
   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 @@
             ${FLASH_FLAGS} \
             ${SCREENSAVER_FLAG} \
             ${SKIP_OOBE} \
+            ${PKCS11_FLAGS} \
 -- "$WM_SCRIPT"