commit faa6fb0cf397e7fba0d2dada83bbb83519f9c392
author Don Garrett <dgarrett@google.com> Wed Sep 10 12:24:27 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 12 03:40:20 2014 +0000
tree 1ed9ef6150914e1f1b25d530774538c5eb434e7c
parent 3c5d4208f80ad4567d291c92591c85828d5742f2

cros_generate_update_payload: Remove excessive umount busy logging.

We've been chasing this umount busy bug for a long time, and this excessive
logging doesn't seem to help. Replace it with a pointer to the bug to
make life easier for sheriffs/deputies.

BUG=None
TEST=Not much.

Change-Id: I7ae8b821d66d1350309510fbb4deb3e50887d3aa
Reviewed-on: https://chromium-review.googlesource.com/217521
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

host/cros_generate_update_payload

diff --git a/host/cros_generate_update_payload b/host/cros_generate_update_payload
index c88e32d..91d96d8 100755
--- a/host/cros_generate_update_payload
+++ b/host/cros_generate_update_payload
@@ -46,37 +46,6 @@
 DST_ROOT=""
 STATE_MNT=""
 
-dump_umount_diags() {
-  local mnt_point="$1"
-
-  echo "Running Diagnostics:"
-  echo
-
-  echo "cat /etc/mtab:"
-  sudo cat /etc/mtab
-  echo
-
-  echo "cat /proc/mounts:"
-  sudo cat /proc/mounts
-  echo
-
-  echo "fndmnt:"
-  sudo findmnt
-  echo
-
-  echo "lsof +D:"
-  sudo lsof +D "$mnt_point"
-  echo
-
-  echo "find:"
-  sudo find "$mnt_point"
-  echo
-
-  echo "fuser -vm:"
-  sudo fuser -vm "$mnt_point"
-  echo
-}
-
 # umount a loopback device, and remove the mount point.
 # This can be called normally (set -e), or during cleanup (set +3).
 umount_and_rmdir() {
@@ -95,7 +64,7 @@
     sudo umount -v "$mnt_point" || umount_ret=$?
     if [ ${umount_ret} -ne 0 ]; then
       echo "sudo umount -vl ${mnt_point} exited with: $umount_ret"
-      dump_umount_diags "${mnt_point}"
+      echo "Please note this failure in crbug.com/358933"
     fi
 
     rmdir_ret=0
@@ -105,7 +74,7 @@
       return 0
     else
       echo "sudo rmdir -v ${mnt_point} exited with: $rmdir_ret"
-      dump_umount_diags "${mnt_point}"
+      echo "Please note this failure in crbug.com/358933"
     fi
 
     sleep 60
@@ -358,7 +327,9 @@
   SRC_MNT=$(mktemp -d --tmpdir="${FLAGS_work_dir}" src_root.XXXXXX)
   sudo mount -o loop,ro "$SRC_ROOT" "$SRC_MNT"
 
-  sudo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}  PATH=${PATH} "$GENERATOR" \
+  # Preserve the path during sudo so that unpacked binaries are used when
+  # outside the chroot.
+  sudo PATH=${PATH} "$GENERATOR" \
       -new_dir "$DST_MNT" -new_image "$DST_ROOT" -new_kernel "$DST_KERNEL" \
       -old_dir "$SRC_MNT" -old_image "$SRC_ROOT" -old_kernel "$SRC_KERNEL" \
       -out_file "$FLAGS_output" -private_key "$FLAGS_private_key" \