Switch from v_info logging to debug

enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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 enter the chroot environment
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 53 matching lines @@
 If [-- command] is present, runs the command inside the chroot,
 after changing directory to /$USER/trunk/src/scripts.  Note that neither
 the command nor args should include single quotes.  For example:
 
     $0 -- ./build_platform_packages.sh
 
 Otherwise, provides an interactive shell.
 "
 
 # 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
     info "$1"
   fi
 }
 
 # Double up on the first '--' argument.  Why?  For enter_chroot, we want to
 # emulate the behavior of sudo for setting environment vars.  That is, we want:
 #   ./enter_chroot [flags] [VAR=val] [-- command]
 # ...but shflags ends up eating the '--' out of the command line and gives
 # us back "VAR=val" and "command" together in one chunk.  By doubling up, we
@@ skipping 50 matching lines @@
 function setup_env {
   # Validate sudo timestamp before entering the critical section so that we
   # don't stall for a password while we have the lockfile.
   # Don't use sudo -v since that has issues on machines w/ no password.
   sudo echo "" > /dev/null
 
   (
     flock 200
     echo $$ >> "$LOCKFILE"
 
-    v_info "Mounting chroot environment."
+    debug "Mounting chroot environment."
 
     # Mount only if not already mounted
     MOUNTED_PATH="$(readlink -f "$FLAGS_chroot/proc")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
       sudo mount none -t proc "$MOUNTED_PATH" || \
           die "Could not mount $MOUNTED_PATH"
     fi
 
     MOUNTED_PATH="$(readlink -f "$FLAGS_chroot/sys")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
@@ skipping 31 matching lines @@
       sudo mount --bind "$FLAGS_trunk" "$MOUNTED_PATH" || \
           die "Could not mount $MOUNTED_PATH"
     fi
 
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_CHROME_ROOT}")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
       ! CHROME_ROOT="$(readlink -f "$FLAGS_chrome_root")"
       if [ -z "$CHROME_ROOT" ]; then
         ! CHROME_ROOT="$(cat "${FLAGS_chroot}${CHROME_ROOT_CONFIG}" \
           2>/dev/null)"
+        CHROME_ROOT_AUTO=1
       fi
-      if [[ ( -z "$CHROME_ROOT" ) || ( ! -d "${CHROME_ROOT}/src" ) ]]; then
-        v_info "Not mounting chrome source"
-        sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
-      else
-        v_info "Mounting chrome source at: $INNER_CHROME_ROOT"
-        echo "$CHROME_ROOT" | \
-          sudo dd of="${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
-        mkdir -p "$MOUNTED_PATH"
-        sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH" || \
-          die "Could not mount $MOUNTED_PATH"
+      if [[ ( -n "$CHROME_ROOT" ) ]]; then
+        if [[ ( ! -d "${CHROME_ROOT}/src" ) ]]; then
+          error "Not mounting chrome source"
+          sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
+          if [[ ! "$CHROME_ROOT_AUTO" ]]; then

[diandersAtChromium, 2011/02/08 02:35:13]

It is only a fatal error if user specified in the command line.

...if user didn't specify it in the command line, it will be a non-fatal error
(and the file will be deleted, so things will work next time).

[dgarrett, 2011/02/08 02:40:55]

Right. As best as I can figure out, this is as designed. There is no command
line for clearing the remembered CHROME_ROOT value.

On 2011/02/08 02:35:13, diandersAtChromium wrote:

+            exit 1
+          fi
+        else
+          debug "Mounting chrome source at: $INNER_CHROME_ROOT"
+          sudo bash -c "echo $CHROME_ROOT > \

[diandersAtChromium, 2011/02/08 02:35:13]

nit: Should put quotes around $CHROME_ROOT, just to be safe.

[dgarrett, 2011/02/08 02:40:55]

Done.

+            ${FLAGS_chroot}${CHROME_ROOT_CONFIG}"

[diandersAtChromium, 2011/02/08 02:35:13]

nite: ...and probably quotes here, too?

[dgarrett, 2011/02/08 02:40:55]

Done.

+          mkdir -p "$MOUNTED_PATH"
+          sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH" || \
+            die "Could not mount $MOUNTED_PATH"
+        fi
       fi
     fi
 
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_DEPOT_TOOLS_ROOT}")"
     if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
       if [ $(which gclient 2>/dev/null) ]; then
-        v_info "Mounting depot_tools"
+        debug "Mounting depot_tools"
         DEPOT_TOOLS=$(dirname "$(which gclient)")
         mkdir -p "$MOUNTED_PATH"
         if ! sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"; then
           warn "depot_tools failed to mount; perhaps it's on NFS?"
           warn "This may impact chromium build."
         fi
       fi
     fi
 
     # Install fuse module.
@@ skipping 49 matching lines @@
     # Remove any dups from lock file while installing new one
     sort -n "$TMP_LOCKFILE" | uniq > "$LOCKFILE"
 
     if [ $(which gconftool-2 2>/dev/null) ]; then
       SAVED_PREF=$(cat "${FLAGS_chroot}${SAVED_AUTOMOUNT_PREF_FILE}")
       gconftool-2 -s --type=boolean ${AUTOMOUNT_PREF} ${SAVED_PREF} || \
         warn "could not re-set your automount preference."
     fi
 
     if [ -s "$LOCKFILE" ]; then
-      v_info "At least one other pid is running in the chroot, so not"
-      v_info "tearing down env."
+      debug "At least one other pid is running in the chroot, so not"
+      debug "tearing down env."
     else
       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
       # cascading mounts in proper order
       for i in \
         $(mount | grep -F "on $MOUNTED_PATH/" | sort -r | awk '{print $3}'); do
         safe_umount "$i"
       done
     fi
   ) 200>>"$LOCKFILE" || die "teardown_env failed"
 }
 
 if [ $FLAGS_mount -eq $FLAGS_TRUE ]; then
   setup_env
-  v_info "Make sure you run"
-  v_info "    $0 --unmount"
-  v_info "before deleting $FLAGS_chroot"
-  v_info "or you'll end up deleting $FLAGS_trunk too!"
+  info "Make sure you run"
+  info "    $0 --unmount"
+  info "before deleting $FLAGS_chroot"
+  info "or you'll end up deleting $FLAGS_trunk too!"
   exit 0
 fi
 
 if [ $FLAGS_unmount -eq $FLAGS_TRUE ]; then
   teardown_env
   exit 0
 fi
 
 # Apply any hacks needed to update the chroot.
 chroot_hacks_from_outside "${FLAGS_chroot}"
@@ skipping 19 matching lines @@
 # Use git:8 chars of sha1
 REVISION=$(cd ${FLAGS_trunk}/src/scripts ; git rev-parse --short=8 HEAD)
 CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
 CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \
 CHROMEOS_RELEASE_APPID=${CHROMEOS_RELEASE_APPID:-"{DEV-BUILD}"}"
 CHROOT_PASSTHRU="${CHROOT_PASSTHRU} \
 CHROMEOS_VERSION_TRACK=$CHROMEOS_VERSION_TRACK CHROMEOS_VERSION_AUSERVER=$CHROMEOS_VERSION_AUSERVER CHROMEOS_VERSION_DEVSERVER=$CHROMEOS_VERSION_DEVSERVER"
 
 if [ -d "$HOME/.subversion" ]; then
   # 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")"
   if [ -z "$(mount | grep -F "on $MOUNTED_PATH ")" ]; then
     mkdir -p "$MOUNTED_PATH"
     sudo mount --bind "$HOME/.subversion" "$MOUNTED_PATH" || \
       die "Could not mount $MOUNTED_PATH"
   fi
 fi
 
 # Configure committer username and email in chroot .gitconfig
 if [ $FLAGS_git_config -eq $FLAGS_TRUE ]; then
   git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
     user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
   git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
     user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
       sed -e 's/.*<\([^>]*\)>.*/\1/')"
 fi
 
 # Run command or interactive shell.  Also include the non-chrooted path to
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo -- chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
   EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C SSH_AGENT_PID="${SSH_AGENT_PID}" \
   SSH_AUTH_SOCK="${SSH_AUTH_SOCK}" "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env