mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 14:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch from v_info logging to debug

Browse Source 
Change-Id: I9a3177bf295462d40a6e7045a2ffb793bbfe3166

BUG=chromium-os:11672
TEST=Manual

Review URL: http://codereview.chromium.org/6246148
This commit is contained in:
Don Garrett 2011-02-07 18:39:59 -08:00
parent fa42b03ffe
commit a0e7ea185a
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
enter_chroot.sh
View File

@ -71,7 +71,7 @@ Otherwise, provides an interactive shell.
" "
# Version of info from common.sh that only echos if --verbose is set. # Version of info from common.sh that only echos if --verbose is set.
function v_info { function debug {
if [ $FLAGS_verbose -eq $FLAGS_TRUE ]; then if [ $FLAGS_verbose -eq $FLAGS_TRUE ]; then
info "$1" info "$1"
fi fi
@ -142,7 +142,7 @@ function setup_env {
flock 200 flock 200
echo $$ >> "$LOCKFILE" echo $$ >> "$LOCKFILE"
v_info "Mounting chroot environment." debug "Mounting chroot environment."
# Mount only if not already mounted # Mount only if not already mounted
MOUNTED_PATH="$(readlink -f "$FLAGS_chroot/proc")" MOUNTED_PATH="$(readlink -f "$FLAGS_chroot/proc")"
@ -194,24 +194,30 @@ function setup_env {
if [ -z "$CHROME_ROOT" ]; then if [ -z "$CHROME_ROOT" ]; then
! CHROME_ROOT="$(cat "${FLAGS_chroot}${CHROME_ROOT_CONFIG}" \ ! CHROME_ROOT="$(cat "${FLAGS_chroot}${CHROME_ROOT_CONFIG}" \
2>/dev/null)" 2>/dev/null)"
CHROME_ROOT_AUTO=1
fi fi
if [[ ( -z "$CHROME_ROOT" ) || ( ! -d "${CHROME_ROOT}/src" ) ]]; then if [[ ( -n "$CHROME_ROOT" ) ]]; then
v_info "Not mounting chrome source" if [[ ( ! -d "${CHROME_ROOT}/src" ) ]]; then
sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}" error "Not mounting chrome source"
else sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
v_info "Mounting chrome source at: $INNER_CHROME_ROOT" if [[ ! "$CHROME_ROOT_AUTO" ]]; then
echo "$CHROME_ROOT" | \ exit 1
sudo dd of="${FLAGS_chroot}${CHROME_ROOT_CONFIG}" fi
mkdir -p "$MOUNTED_PATH" else
sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH" || \ debug "Mounting chrome source at: $INNER_CHROME_ROOT"
die "Could not mount $MOUNTED_PATH" sudo bash -c "echo '$CHROME_ROOT' > \
'${FLAGS_chroot}${CHROME_ROOT_CONFIG}'"
mkdir -p "$MOUNTED_PATH"
sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH" || \
die "Could not mount $MOUNTED_PATH"
fi
fi fi
fi fi
MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_DEPOT_TOOLS_ROOT}")" MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_DEPOT_TOOLS_ROOT}")"
if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
if [ $(which gclient 2>/dev/null) ]; then if [ $(which gclient 2>/dev/null) ]; then
v_info "Mounting depot_tools" debug "Mounting depot_tools"
DEPOT_TOOLS=$(dirname "$(which gclient)") DEPOT_TOOLS=$(dirname "$(which gclient)")
mkdir -p "$MOUNTED_PATH" mkdir -p "$MOUNTED_PATH"
if ! sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"; then if ! sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"; then
@ -281,11 +287,11 @@ function teardown_env {
fi fi
if [ -s "$LOCKFILE" ]; then if [ -s "$LOCKFILE" ]; then
v_info "At least one other pid is running in the chroot, so not" debug "At least one other pid is running in the chroot, so not"
v_info "tearing down env." debug "tearing down env."
else else
MOUNTED_PATH=$(readlink -f "$FLAGS_chroot") MOUNTED_PATH=$(readlink -f "$FLAGS_chroot")
v_info "Unmounting chroot environment." debug "Unmounting chroot environment."
# sort the list of mounts in reverse order, to ensure umount of # sort the list of mounts in reverse order, to ensure umount of
# cascading mounts in proper order # cascading mounts in proper order
for i in \ for i in \
@ -298,10 +304,10 @@ function teardown_env {
if [ $FLAGS_mount -eq $FLAGS_TRUE ]; then if [ $FLAGS_mount -eq $FLAGS_TRUE ]; then
setup_env setup_env
v_info "Make sure you run" info "Make sure you run"
v_info " $0 --unmount" info " $0 --unmount"
v_info "before deleting $FLAGS_chroot" info "before deleting $FLAGS_chroot"
v_info "or you'll end up deleting $FLAGS_trunk too!" info "or you'll end up deleting $FLAGS_trunk too!"
exit 0 exit 0
fi fi
@ -341,7 +347,7 @@ CHROMEOS_VERSION_TRACK=$CHROMEOS_VERSION_TRACK CHROMEOS_VERSION_AUSERVER=$CHROME
if [ -d "$HOME/.subversion" ]; then if [ -d "$HOME/.subversion" ]; then
# Bind mounting .subversion into chroot # Bind mounting .subversion into chroot
v_info "mounting ~/.subversion into chroot" debug "mounting ~/.subversion into chroot"
MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}/home/${USER}/.subversion")" MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}/home/${USER}/.subversion")"
if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
mkdir -p "$MOUNTED_PATH" mkdir -p "$MOUNTED_PATH"