Use correct log functions for enter_chroot's console spew.

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
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 63 matching lines @@
 
 sudo chmod 0777 "$FLAGS_chroot/var/lock"
 
 LOCKFILE="$FLAGS_chroot/var/lock/enter_chroot"
 
 function setup_env {
   (
     flock 200
     echo $$ >> "$LOCKFILE"
 
-    echo >&2 "Mounting chroot environment."
+    info "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")"
@@ skipping 40 matching lines @@
 
     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)"
       fi
       if [[ ( -z "$CHROME_ROOT" ) || ( ! -d "${CHROME_ROOT}/src" ) ]]; then
-        echo >&2 "Not mounting chrome source"
+        info "Not mounting chrome source"

[kliegs, 2010/09/02 15:34:30]

NIT: This should be switched to conditional and be an info if CHROME_ROOT is not
set and an error if it is.

         sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
       else
-        echo >&2 "Mounting chrome source at: $INNER_CHROME_ROOT"
+        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"
       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
-        echo >&2 "Mounting depot_tools"
+        info "Mounting depot_tools"
         DEPOT_TOOLS=$(dirname $(which gclient) )
         mkdir -p "$MOUNTED_PATH"
         if ! sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"; then
-          echo >&2 "depot_tools failed to mount; perhaps it's on NFS?"
-          echo >&2 "This may impact chromium build."
+          warn "depot_tools failed to mount; perhaps it's on NFS?"
+          warn "This may impact chromium build."
         fi
       fi
     fi
 
     # Install fuse module.
     if [ -c "${FUSE_DEVICE}" ] ; then
       sudo modprobe fuse 2> /dev/null ||\
-        echo >&2 "-- Note: modprobe fuse failed.  gmergefs will not work"
+        warn "-- Note: modprobe fuse failed.  gmergefs will not work"
     fi
 
     # Turn off automounting of external media when we enter the
     # chroot; thus we don't have to worry about being able to unmount
     # from inside.
     if [ $(which gconftool-2 2>/dev/null) ]; then
       gconftool-2 -g ${AUTOMOUNT_PREF} > \
         "${FLAGS_chroot}${SAVED_AUTOMOUNT_PREF_FILE}"
       if [ $(gconftool-2 -s --type=boolean ${AUTOMOUNT_PREF} false) ]; then
-        echo >&2 "-- Note: USB sticks may be automounted by your host OS."
-        echo >&2 "-- Note: If you plan to burn bootable media, you may need to"
-        echo >&2 "-- Note: unmount these devices manually, or run image_to_usb.sh"
-        echo >&2 "-- Note: outside the chroot."
+        warn "-- Note: USB sticks may be automounted by your host OS."
+        warn "-- Note: If you plan to burn bootable media, you may need to"
+        warn "-- Note: unmount these devices manually, or run image_to_usb.sh"
+        warn "-- Note: outside the chroot."
       fi
     fi
 
   ) 200>>"$LOCKFILE" || die "setup_env failed"
 }
 
 function teardown_env {
   # Only teardown if we're the last enter_chroot to die
   (
     flock 200
@@ skipping 14 matching lines @@
         # All good, keep going
         echo "$PID" >> "$TMP_LOCKFILE"
       fi
     done
     # 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} || \
-        echo >&2 "could not re-set your automount preference."
+        warn "could not re-set your automount preference."
     fi
 
     if [ -s "$LOCKFILE" ]; then
-      echo >&2 "At least one other pid is running in the chroot, so not"
-      echo >&2 "tearing down env."
+      info "At least one other pid is running in the chroot, so not"
+      info "tearing down env."
     else
       MOUNTED_PATH=$(readlink -f "$FLAGS_chroot")
-      echo >&2 "Unmounting chroot environment."
+      info "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
-  echo >&2 "Make sure you run"
-  echo >&2 "    $0 --unmount"
-  echo >&2 "before deleting $FLAGS_chroot"
-  echo >&2 "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
 
 # Make sure we unmount before exiting
@@ skipping 11 matching lines @@
 # which pass each command line into a separate call to enter_chroot
 # so always have up-to-date info.  For developer builds, there may not
 # be a single revision, since the developer may have
 # hand-sync'd some subdirs and edited files in others.
 # In that case, check against origin/HEAD and mark** revision.
 # Use git:8 chars of sha1
 REVISION=$(git rev-parse --short=8 HEAD)
 CHROOT_PASSTHRU="CHROMEOS_REVISION=$REVISION BUILDBOT_BUILD=$FLAGS_build_number CHROMEOS_OFFICIAL=$CHROMEOS_OFFICIAL"
 if [ -d "$HOME/.subversion" ]; then
   # Bind mounting .subversion into chroot
-  echo >&2 "mounting ~/.subversion into chroot"
+  info "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
 
 # 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