| Index: set_shared_user_password.sh
|
| diff --git a/set_shared_user_password.sh b/set_shared_user_password.sh
|
| index 25baca0e632352cce4b01469bebd2cadf2a70485..bdc7c44f1a252a37ce8d6e9bfd582a68e222a048 100755
|
| --- a/set_shared_user_password.sh
|
| +++ b/set_shared_user_password.sh
|
| @@ -7,12 +7,29 @@
|
| # Script to set the password for the shared user account. Stores the
|
| # MD5crypt'd password to a file, for use by customize_rootfs.sh.
|
|
|
| -# Load common constants. This should be the first executable line.
|
| -# The path to common.sh should be relative to your script's location.
|
| -. "$(dirname "$0")/common.sh"
|
| +# --- 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 $*
|
| +restart_in_chroot_if_needed "$@"
|
|
|
| FLAGS_HELP="USAGE: $0 [flags]"
|
|
|
|
|