From fc13bc2353668a3b6f81245b35198430a598a9d0 Mon Sep 17 00:00:00 2001
From: "drewry@google.com"
 <drewry@google.com@06c00378-0e64-4dae-be16-12b19f9950a1>
Date: Thu, 29 Oct 2009 14:46:00 +0000
Subject: [PATCH] Only use pam_mount for slim-based logins. Everything else
 should avoid touching cryptohome.

Review URL: http://chromereview.prom.corp.google.com/1180003


git-svn-id: svn://chrome-svn/chromeos/trunk@122 06c00378-0e64-4dae-be16-12b19f9950a1
---
 customize_rootfs.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/customize_rootfs.sh b/customize_rootfs.sh
index f66883565d..61d3351b5f 100755
--- a/customize_rootfs.sh
+++ b/customize_rootfs.sh
@@ -479,6 +479,9 @@ LABEL=C-STATE /mnt/stateful_partition ext3 rw 0 1
 /mnt/stateful_partition/var /var bind defaults,bind 0 0
 EOF
 
+# Remove pam-mount's default entry in common-auth and common-session
+sed -i 's/^\(.*pam_mount.so.*\)/#\1/g' /etc/pam.d/common-*
+
 # List all packages still installed post-pruning
 sudo sh -c "/trunk/src/scripts/list_installed_packages.sh \
   > /etc/package_list_pruned.txt"