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

Unified Diff: src/platform/cryptohome/lib/common

Issue 490001: make cryptohome check a magic file to discern between chrome-login and slim-login (Closed)
Patch Set: mount error handlers already assumed common worked Created 11 years 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 | « src/platform/cryptohome/bin/mount ('k') | src/scripts/build_chrome.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/cryptohome/lib/common
diff --git a/src/platform/cryptohome/lib/common b/src/platform/cryptohome/lib/common
index c46f8955e444b58f2336673a8506940434562c53..b78125ab3cef5bb095f1d8d6748c827363e4d04c 100755
--- a/src/platform/cryptohome/lib/common
+++ b/src/platform/cryptohome/lib/common
@@ -17,7 +17,15 @@ export STDERR_FILE=/var/log/cryptohome.stderr.log
export DEFAULT_USER=chronos
export DEFAULT_LOOP_DEVICE=/dev/loop0
export DEFAULT_MAPPER_DEVICE=/dev/mapper/cryptohome
-export DEFAULT_MOUNT_POINT=/home/$DEFAULT_USER
+
+# temporary hack to check if we're doing chrome-login
+CHROME_LOGIN_FILE=/tmp/doing-chrome-login
+MOUNT_POINT=/home/$DEFAULT_USER
+if [ -f ${CHROME_LOGIN_FILE} ]; then
+ MOUNT_POINT=${MOUNT_POINT}/user
+fi
+
+export DEFAULT_MOUNT_POINT=${MOUNT_POINT}
# If the variable is defined and the file exists,
# encryption will be disabled for users listed in the
« no previous file with comments | « src/platform/cryptohome/bin/mount ('k') | src/scripts/build_chrome.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698