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

Unified Diff: chromeos/scripts/customize_rootfs

Issue 6480096: Don't set chronos default shell to bash. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/chromiumos-overlay.git@master
Patch Set: Created 9 years, 10 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: chromeos/scripts/customize_rootfs
diff --git a/chromeos/scripts/customize_rootfs b/chromeos/scripts/customize_rootfs
index 11ef18df3a98e252b9324cd8c3f6f30e2f8be174..f0f626403ca09e3262b7f57cf73aa0a0850f4472 100755
--- a/chromeos/scripts/customize_rootfs
+++ b/chromeos/scripts/customize_rootfs
@@ -68,9 +68,6 @@ sudo chmod 0755 "${ROOT_FS_DIR}/."
# Set up a default dev user, update the password entry, and add to sudo.
# TODO: Make the default user conditional on building a dev image.
DEV_USER="chronos"
-SHELL="/bin/sh"
-[[ -x "${ROOT_FS_DIR}/usr/local/bin/bash" ]] && SHELL="/usr/local/bin/bash"
-[[ -x "${ROOT_FS_DIR}/bin/bash" ]] && SHELL="/bin/bash"
# Determine what password to use for the default user.
CRYPTED_PASSWD_FILE="${SCRIPTS_DIR}/shared_user_passwd.txt"
@@ -84,7 +81,7 @@ else
fi
# Replace the DEV_USER passwd entry with one that sets the proper shell and
# specifies that the passwd should come from /etc/shadow.
-sudo sed -i "{ s|${DEV_USER}:\*:\(.*\):.*|${DEV_USER}:x:\1:${SHELL}| }" \
+sudo sed -i "{ s|${DEV_USER}:\*:\(.*\):.*|${DEV_USER}:x:\1:/bin/sh| }" \
"${ROOT_FS_DIR}/etc/passwd"
echo "${DEV_USER}:${CRYPTED_PASSWD}:14500:0:99999::::" \
| sudo dd of="${ROOT_FS_DIR}/etc/shadow" conv=notrunc oflag=append
« 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