mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup set_shared_user_password related transitional code.

Browse Source 
BUG=none
TEST=set_shared_user_passwd, build_image, checked password

Change-Id: Ida251e36f32d6cb116425d475882c5cee601b9f6

Review URL: http://codereview.chromium.org/6904093
This commit is contained in:
Darin Petkov 2011-04-29 10:24:26 -07:00
parent b290366b6e
commit 61173f6bd1
2 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_image
View File

@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@ -136,10 +136,6 @@ check_blacklist() {
check_blacklist
# TODO(petkov): Remove along with the --move_to_etc flag support once the
# transition dust settles.
"${SCRIPTS_DIR}"/set_shared_user_password.sh --move_to_etc
# TODO(vlaviano): Validate command line flags. Check for conflicting flags and
# reconcile them if possible. Exit with an error message otherwise.

54
set_shared_user_password.sh
View File

@ -1,67 +1,25 @@
#!/bin/bash
# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Script to set the password for the shared user account. Stores the
# MD5crypt'd password to a file, for use by customize_rootfs.sh.
# Script to set the password for the shared user account. Stores the MD5crypt'd
# password to a file inside chroot, for use by build_image.
# --- BEGIN COMMON.SH BOILERPLATE ---
# Load common CrOS utilities. Inside the chroot this file is installed in
# /usr/lib/crosutils. Outside the chroot we find it relative to the script's
# location.
find_common_sh() {
local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
local path
SCRIPT_ROOT=
for path in "${common_paths[@]}"; do
if [ -r "${path}/common.sh" ]; then
SCRIPT_ROOT=${path}
break
fi
done
}
find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
# --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot
restart_in_chroot_if_needed "$@"
FLAGS_HELP="USAGE: $0 [flags]"
# TODO(petkov): This flag and setting of src/scripts/shared_user_passwd.txt can
# go away once the transition dust settles.
DEFINE_boolean move_to_etc ${FLAGS_FALSE} \
"Move src/scripts/shared_user_passwd.txt to /etc."
# Parse command line
FLAGS "$@" || exit 1
eval set -- "${FLAGS_ARGV}"
# This can only run inside the chroot.
. "/usr/lib/crosutils/common.sh" || exit 1
# Die on any errors.
set -e
CRYPTED_PASSWD_FILE="${SCRIPTS_DIR}/shared_user_passwd.txt"
SHARED_USER_PASSWD_FILE="/etc/shared_user_passwd.txt"
if [ ${FLAGS_move_to_etc} -eq ${FLAGS_TRUE} ]; then
if [ -r "${CRYPTED_PASSWD_FILE}" ]; then
cat "${CRYPTED_PASSWD_FILE}" | sudo_clobber "${SHARED_USER_PASSWD_FILE}"
echo "Copied ${CRYPTED_PASSWD_FILE} to ${SHARED_USER_PASSWD_FILE}."
fi
exit 0
fi
# Get password
read -p "Enter password for shared user account: " PASSWORD
CRYPTED_PASSWD="$(echo "$PASSWORD" | openssl passwd -1 -stdin)"
PASSWORD="gone now"
echo "${CRYPTED_PASSWD}" > "${CRYPTED_PASSWD_FILE}"
echo "${CRYPTED_PASSWD}" | sudo_clobber "${SHARED_USER_PASSWD_FILE}"
echo "Password set in ${CRYPTED_PASSWD_FILE} and ${SHARED_USER_PASSWD_FILE}"
echo "Password set in ${SHARED_USER_PASSWD_FILE}"