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

Unified Diff: mod_for_test_scripts/710enableAuthTesting

Issue 3185024: pam_google is no longer in the image, so we must create /etc/login_trust_root.pem from scratch (Closed) Base URL: http://src.chromium.org/git/crosutils.git
Patch Set: Created 10 years, 4 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: mod_for_test_scripts/710enableAuthTesting
diff --git a/mod_for_test_scripts/710enableAuthTesting b/mod_for_test_scripts/710enableAuthTesting
index 3d9a96afd1e100c1551fe789c9d701500b708811..7d2aae8564d49cabf8c3d1c2c244475d9ff976cf 100755
--- a/mod_for_test_scripts/710enableAuthTesting
+++ b/mod_for_test_scripts/710enableAuthTesting
@@ -44,17 +44,12 @@ sudo chroot "${ROOT_FS_DIR}" ${QEMU} \
-n FakeCert -t "C,," -a -i "${FAKE_CA_DIR}/${CERT_NAME}.pem"
chmod 0644 "${ROOT_FS_DIR}/${FAKE_NSSDB}"/*
-# TODO(cmasone): get rid of this once we're off pam_google for good.
-# Sadly, our fake cert HAS to be first in this file.
-TMPFILE=$(mktemp)
CERT_FILE="${ROOT_FS_DIR}/etc/login_trust_root.pem"
-PERMS=$(stat --printf="%a" "${CERT_FILE}")
-cat "${ROOT_FS_DIR}/${TMP_CERT}" "${CERT_FILE}" > "${TMPFILE}"
-mv -f "${TMPFILE}" "${CERT_FILE}"
-chmod "${PERMS}" "${CERT_FILE}"
+mv -f "${ROOT_FS_DIR}/${TMP_CERT}" "${CERT_FILE}"
+chmod 0644 "${CERT_FILE}"
if [ -n "${QEMU}" ] ; then
rm "${ROOT_FS_DIR}/${QEMU}"
fi
-rm "${ROOT_FS_DIR}/${TMP_KEY}"
-rm "${ROOT_FS_DIR}/${TMP_CERT}"
+rm -f "${ROOT_FS_DIR}/${TMP_KEY}"
+rm -f "${ROOT_FS_DIR}/${TMP_CERT}"
« 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